@eui/tools 4.17.2 → 4.17.6

package/.version.properties

@@ -1 +1 @@
-4.17.2
+4.17.6

package/CHANGELOG.md

@@ -1,3 +1,43 @@
+## 4.17.6 (2021-11-30)
+
+##### Bug Fixes
+
+* **other:**
+  * package history for remote on first release - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([eb197f5f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/eb197f5faaa17c8aa00e9df33d2d09ffce65f095))
+
+* * *
+* * *
+## 4.17.5 (2021-11-25)
+
+##### Chores
+
+* **other:**
+  * eui10 element creation adaptation MWP-7583 [MWP-7583](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-7583)  ([0165130e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0165130e42ff83aa343bedb98da13c1c608f442f))
+
+* * *
+* * *
+## 4.17.4 (2021-11-24)
+
+##### Chores
+
+* **other:**
+  * removed yarn.lock injection - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([5bd7860f](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/5bd7860f8d1296aeca3ed899cbb334d5cef56e15))
+
+* * *
+* * *
+## 4.17.3 (2021-11-24)
+
+##### Chores
+
+* **other:**
+  * update comments for setup on remote v7  ([00b827d7](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/00b827d72f0ce558e6b854ac9ebe9a8a2a9005fc))
+##### Bug Fixes
+
+* **other:**
+  * remote package metadata location - EUI-4107 [EUI-4107](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4107)  ([ca8e4e5a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/ca8e4e5a8d94a98c42e8e14e2eb0a21f8010aa91))
+
+* * *
+* * *
 ## 4.17.2 (2021-11-23)
 
 ##### Chores

package/package.json

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

package/sandbox.js

@@ -120,10 +120,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(() => {
@@ -597,24 +597,24 @@ const notificationUtils = require('./scripts/utils/notification/notification-uti
 //                 });
 //     console.log(tools.sortArray(a, 'name'));
 //   })
-return Promise.resolve()
-  .then(() => {
-    console.log('t1')
-    console.log(new Date());
+// return Promise.resolve()
+//   .then(() => {
+//     console.log('t1')
+//     console.log(new Date());
 
-    return new Promise((resolve) => {
-      setTimeout(resolve, 8000);
-    });
-  })
+//     return new Promise((resolve) => {
+//       setTimeout(resolve, 8000);
+//     });
+//   })
 
-  .then(() => {
-    console.log('t2')
-    console.log(new Date());
-  })
+//   .then(() => {
+//     console.log('t2')
+//     console.log(new Date());
+//   })
 
-  .then(() => {
-    console.log('T3')
-  })
+//   .then(() => {
+//     console.log('T3')
+//   })
 
 // return Promise.resolve()
 //   .then(() => {

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

@@ -43,7 +43,8 @@ import { CustomSerializer } from './reducers/custom-route-serializer';
 
 import { environment } from '../environments/environment';
 
-// import { TaskMgrCommonModule } from '@cc/task-manager'; // TODO import from package
+// TODO[REMOTE-SETUP] - import from wrapped package
+// import { TaskMgrCommonModule } from '@cc/task-manager';
 import { ELEMENT_ROUTER_TOKEN, PushNotificationMapping, UxServiceMapping } from '@csdr/integration';
 import { RoutingModule } from './routing.module';
 
@@ -66,7 +67,8 @@ export function openidConnectInterceptorFactory(config) {
         TranslateModule,
 
         UxAllModule,
-        // TaskMgrCommonModule, // TODO import from package
+         // TODO import from package
+        // TaskMgrCommonModule,
         RoutingModule,
     ],
     declarations: [

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

@@ -46,6 +46,7 @@ import {
     USER_SERVICE_HOST_TOKEN,
     UserMapping,
     UX_SERVICE_HOST_TOKEN,
+    UX_APP_SHELL_SERVICE_HOST_TOKEN,
     UxAppShellServiceMapping,
 } from '@csdr/integration';
 import { RoutingModule } from './routing.module';
@@ -84,7 +85,7 @@ export function openidConnectInterceptorFactory(config) {
         reducerProvider,
         {
             provide: EUI_CONFIG_TOKEN,
-            useValue: { appConfig, environment },
+            useValue: { appConfig: { ...appConfig, ...environment }, environment },
         },
         {
             provide: HTTP_INTERCEPTORS,
@@ -123,6 +124,7 @@ export function openidConnectInterceptorFactory(config) {
         // used in the el-mappers
         { 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: PushNotificationsService,
@@ -143,9 +145,11 @@ export function openidConnectInterceptorFactory(config) {
                 router: Router,
                 storeService: StoreService,
                 iI18nService: I18nService,
-                hostUserService: any) => new UxAppShellServiceMapping(
-                    config, http, platformId, router, storeService, iI18nService, hostUserService),
-            deps: [CONFIG_TOKEN, HttpClient, PLATFORM_ID, Router, StoreService, I18nService, UX_SERVICE_HOST_TOKEN],
+                hostUxService: any,
+                hostUxAppShellService: any) => new UxAppShellServiceMapping(
+                    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],
         },
         { provide: ELEMENT_ROUTER_TOKEN, useFactory: () => window['PROVIDERS']['ELEMENT_ROUTER_TOKEN'], deps: [] },
         // TODO[REMOTE-SETUP] uncomment if zipkin is used

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

@@ -218,12 +218,12 @@ module.exports.processLocalEuiVersions = () => {
 
         tools.copy(blResourcesFile, blDestFile);
 
-        tools.logInfo(`Processing yarn.lock replacement for eUI version found : ${euiVersion}`);
+        // tools.logInfo(`Processing yarn.lock replacement for eUI version found : ${euiVersion}`);
 
-        const yResourcesFile = path.join(__dirname, 'resources', euiVersion, 'yarn.lock');
-        const yDestFile = path.join(process.cwd(), 'yarn.lock');
+        // const yResourcesFile = path.join(__dirname, 'resources', euiVersion, 'yarn.lock');
+        // const yDestFile = path.join(process.cwd(), 'yarn.lock');
 
-        tools.copy(yResourcesFile, yDestFile);
+        // tools.copy(yResourcesFile, yDestFile);
       }
     })
     .catch((e) => {

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

@@ -126,6 +126,11 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
 
   const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
 
+  if (!fromBuildMetadata) {
+    tools.logWarning('No previous metadata found for package...skipping');
+    return {};
+  }
+
   return Promise.resolve()
     .then(() => {
       return innerCommon.getDevopsMetadata();

package/scripts/csdr/metadata/package.js

@@ -380,7 +380,7 @@ const storePipelineMetadata = module.exports.storePipelineMetadata = (pkgMetadat
 module.exports.storeMetadataAssets = (pkg, pkgCompositeDeps) => {
   return Promise.resolve()
     .then(() => {
-      const pkgMetadataFile = path.join(pkg.paths.pkgBuild, 'package-metadata.json');
+      const pkgMetadataFile = path.join(pkg.paths.pkgBuild, 'bundles', 'package-metadata.json');
 
       const pkgMetadata = {
         dependencies: pkgCompositeDeps

package/scripts/csdr/metadata/stats.js

@@ -10,7 +10,7 @@ const configUtils = require('../config/config-utils');
 const metadataUtils = require('../metadata/metadata-utils');
 
 // FETCH ARGS
-const { dryRun } = tools.getArgs();
+const { dryRun, skipClone } = tools.getArgs();
 
 
 const groupBy = (xs, f) => {
@@ -29,7 +29,7 @@ module.exports.run = () => {
 
   return Promise.resolve()
     .then(() => {
-      if (!dryRun) {
+      if (!dryRun && !skipClone) {
         return metadataUtils.common.cloneMetadataRepo();
       }
     })
@@ -45,6 +45,8 @@ module.exports.run = () => {
 
       // Accumulating all packages metadata in one single object
       packages.forEach((p) => {
+        console.log(`Processing package : ${p.name}`);
+
         const metadataRoot = path.join(process.cwd(), 'packages', 'devops-metadata');
         const pkgMetadata = tools.getJsonFileContent(path.join(metadataRoot, p.devopsMetadataFile));
         const pkgMetadataVersions = tools.getJsonFileContent(path.join(metadataRoot, p.devopsVersionsMetadataFile));
@@ -52,9 +54,11 @@ module.exports.run = () => {
         const gitCommits = [];
         if (pkgMetadata.versions) {
           pkgMetadata.versions.forEach((v) => {
-            v.gitMetadata.commits.forEach((c) => {
-              gitCommits.push(c);
-            });
+            if (v.gitMetadata.commits) {
+              v.gitMetadata.commits.forEach((c) => {
+                gitCommits.push(c);
+              });
+            }
           });
         }
 

package/scripts/utils/git-utils.js

@@ -107,8 +107,10 @@ const commitAndPush = (branch, message, folder) => {
 
       try {
         tools.logInfo('Commit and push - second try - retrying pull push');
-        execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
-        execa.sync('git', ['push', 'origin', branch], { cwd: folder });
+        // setTimeout(() => {
+          execa.sync('git', ['pull', 'origin', branch], { cwd: folder });
+          execa.sync('git', ['push', 'origin', branch], { cwd: folder });
+        // }, 8000);
 
       } catch (e3) {
         throw new Error(`Failed to push ${message} to ${folder}`);
@@ -139,6 +141,11 @@ const tagVersion = (version, branch, message, folder) => {
       })
       .catch((e) => {
         return Promise.resolve()
+        // .then(() => {
+        //   return new Promise((resolve) => {
+        //     setTimeout(resolve, 8000);
+        //   });
+        // })
         .then(() => {
           execa.sync('git', ['tag', '-a', `v${version}b`, '-m', message], { cwd: folder });
           execa.sync('git', ['push', '--follow-tags', 'origin', branch], { cwd: folder });
@@ -254,6 +261,7 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalR
         return tools.rimraf(folder);
       }
     })
+
     .then(() => {
       if (!tools.isDirExists(folder)) {
         tools.logInfo(`Cloning ${repoUri} in folder "${folder}" ...`);
@@ -269,6 +277,7 @@ const cloneRepo = (repoUri, folder, forced = false, noHistory = false, externalR
         tools.logSuccess();
       }
     })
+
     .then(() => {
       tools.logInfo(`Pulling ${repoUri} in folder "${folder}" ...`);
       execa.shellSync(`git pull`, { cwd: folder, stdio: 'inherit' });