@eui/tools 6.12.15 → 6.12.17

package/.version.properties

@@ -1 +1 @@
-6.12.15
+6.12.17

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.12.17 (2023-06-24)
+
+##### Bug Fixes
+
+* **other:**
+  * added ag-grid license injection for v15 up remotes - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([72e3f699](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/72e3f69973c2f8ae604a8fc000a418d1d6849ad4))
+
+* * *
+* * *
+## 6.12.16 (2023-06-24)
+
+##### Chores
+
+* **other:**
+  * added ag-grid license injection for v15 up remotes - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([2c64afaa](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2c64afaa8e381d0e3c196681ce39909e2c824b36))
+
+* * *
+* * *
 ## 6.12.15 (2023-06-23)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/config/remotes.js

@@ -36,6 +36,7 @@ module.exports.getRemote = (remoteName) => {
     virtual: true,
     paths: {
       root: remoteRootPath,
+      src: path.join(remoteRootPath, 'src'),
       dist: path.join(remoteRootPath, 'dist'),
       publish: path.join(remoteRootPath, 'dist'), // maintain compat with core publish utils
       fromRoot: `remotes/${remoteName}`,

package/scripts/csdr/init/remotes/15.x/full/options/ag-grid/main.ts

@@ -0,0 +1,15 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { AppModule } from './app/module';
+import { environment } from './environments/environment';
+if (environment.production) {
+    enableProdMode();
+}
+
+import { LicenseManager } from 'ag-grid-enterprise';
+// tslint:disable-next-line
+LicenseManager.setLicenseKey(@ag-grid-license@);
+
+platformBrowserDynamic()
+    .bootstrapModule(AppModule)
+    .catch(err => console.log(err));

package/scripts/csdr/init/remotes/16.x/full/options/ag-grid/main.ts

@@ -0,0 +1,15 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { AppModule } from './app/module';
+import { environment } from './environments/environment';
+if (environment.production) {
+    enableProdMode();
+}
+
+import { LicenseManager } from 'ag-grid-enterprise';
+// tslint:disable-next-line
+LicenseManager.setLicenseKey(@ag-grid-license@);
+
+platformBrowserDynamic()
+    .bootstrapModule(AppModule)
+    .catch(err => console.log(err));

package/scripts/csdr/init/remotes.js

@@ -169,6 +169,7 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
 
         const optionUserReducersPath = path.join(fullOptionsPath, 'user-reducers');
         const optionParticipantPath = path.join(fullOptionsPath, 'participant');
+        const optionAgGridPath = path.join(fullOptionsPath, 'ag-grid');
         const optionUserReducersDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'user-reducers.json'));
         const optionZipkinDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'zipkin.json'));
         const optionDynatraceDef = tools.getJsonFileContent(path.join(fullOptionsPath, 'definitions', 'dynatrace.json'));
@@ -191,6 +192,11 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
         if (!remote.skeletonConfig.options) {
           definitionsContent.push('StoreModule.forRoot(TOKEN, { metaReducers })');
 
+          // ag-grid license specific main.ts
+          // license token is replaced at post-install, we get it from the remote root UI pkg assets at specific location
+          if (remote.skeletonConfig.aggridLicenseInjection) {
+            tools.copy(optionAgGridPath, remoteSrcPath);
+          }
 
         // if options, all options are checked and default modules defs are injected following certain conditions
         } else {
@@ -238,9 +244,9 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
             if (remote.skeletonConfig.blockContainerTypes) {
               remote.skeletonConfig.blockContainerTypes.forEach((bc) => {
                 blockContainerPlaceholder += `
-                  <ng-container *ngIf="${bc.condition}">
-                      <${bc.name} [block]="block"></${bc.name}>
-                  </ng-container>
+                <ng-container *ngIf="${bc.condition}">
+                <${bc.name} [block]="block"></${bc.name}>
+                </ng-container>
                 `;
               });
             }

package/scripts/csdr/install/build-package.js

@@ -39,6 +39,10 @@ module.exports.installRemote = (pkg, envTarget, compositeType) => {
       return deps;
     })
 
+    .then(() => {
+      return innerRemotes.postInstall(pkg);
+    })
+
     .catch((e) => {
       throw e;
     })

package/scripts/csdr/install/remotes.js

@@ -170,4 +170,45 @@ module.exports.installDeps = (pkg, envTarget, compositeType) => {
     .catch((e) => {
       throw e;
     })
-}
+  }
+
+
+  module.exports.postInstall = (pkg) => {
+    tools.logTitle('Executing post-install for remote skeleton replacement fetched from root UI package');
+
+    if (!pkg.fullSkeletonSources) {
+      return;
+    }
+
+    if (!pkg.skeletonConfig) {
+      return;
+    }
+
+    if (pkg.skeletonConfig.aggridLicenseInjection) {
+      return Promise.resolve()
+      .then(() => {
+        const rootPkgLicensePath = path.join(
+          pkg.paths.repoNodeModules,
+          pkg.skeletonConfig.rootNpmPkg,
+          'assets', 'ag-grid-license', 'license.json'
+        );
+
+        if (!tools.isFileExists(rootPkgLicensePath)) {
+          throw 'NO_LICENSE_FILE_FOUND';
+        }
+
+        const licenseJSON = tools.getJsonFileContent(rootPkgLicensePath);
+        const license = licenseJSON.license;
+        tools.logInfo(`license key found : ${license}`);
+
+        const mainTsPath = path.join(pkg.paths.src, 'main.ts');
+        tools.replaceInFileSync(mainTsPath, '@ag-grid-license@', license);
+
+        tools.logSuccess('OK => main.ts replaced');
+      })
+
+      .catch((e) => {
+        throw e;
+      })
+    }
+  }