@eui/tools 6.12.32 → 6.12.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/.version.properties
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
6.12.
|
|
1
|
+
6.12.33
|
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
## 6.12.33 (2023-07-26)
|
|
2
|
+
|
|
3
|
+
##### Chores
|
|
4
|
+
|
|
5
|
+
* **other:**
|
|
6
|
+
* integrate workspaces links generation on pre-build route replacement - MWP-9751 [MWP-9751](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9751) ([6ee4edc3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6ee4edc307230443351043877d1d529bb1e199c5))
|
|
7
|
+
|
|
8
|
+
* * *
|
|
9
|
+
* * *
|
|
1
10
|
## 6.12.32 (2023-07-24)
|
|
2
11
|
|
|
3
12
|
##### Chores
|
package/package.json
CHANGED
|
@@ -106,6 +106,11 @@ const injectRoutesConfig = (project) => {
|
|
|
106
106
|
|
|
107
107
|
tools.logInfo(`${routesConfigPath} - injecting in ${project.paths.assetsPath}`);
|
|
108
108
|
tools.copydir(routesConfigPath, project.paths.assetsPath);
|
|
109
|
+
|
|
110
|
+
const workspacesConfigPath = path.join(pkgAssetsPath, project.externalRoutesSources.workspacesConfigAssetsPath);
|
|
111
|
+
tools.logInfo(`${workspacesConfigPath} - injecting in ${project.paths.assetsPath}`);
|
|
112
|
+
tools.copydir(workspacesConfigPath, project.paths.assetsPath);
|
|
113
|
+
|
|
109
114
|
};
|
|
110
115
|
|
|
111
116
|
|
|
@@ -418,6 +423,8 @@ const generateLinks = (project, routes, envTargetFinal) => {
|
|
|
418
423
|
const routeDefsBaseLinksJSON = require(path.join(project.paths.assetsPath, routeDefsBaseLinksFileName));
|
|
419
424
|
const routeDefsBaseFilename = 'route-defs-base.json';
|
|
420
425
|
const routeDefsBaseJSON = require(path.join(project.paths.assetsPath, routeDefsBaseFilename));
|
|
426
|
+
const workspaceDefsBaseFilename = 'workspace-defs-base.json';
|
|
427
|
+
const workspaceDefsBaseJSON = require(path.join(project.paths.assetsPath, workspaceDefsBaseFilename));
|
|
421
428
|
|
|
422
429
|
const getRouteMenuDef = (link) => {
|
|
423
430
|
let routeDef = null;
|
|
@@ -476,11 +483,36 @@ const generateLinks = (project, routes, envTargetFinal) => {
|
|
|
476
483
|
}
|
|
477
484
|
};
|
|
478
485
|
|
|
486
|
+
// global links combining routes links and workspaces links
|
|
487
|
+
let workspaceLinks = [];
|
|
488
|
+
|
|
489
|
+
// Combining workspaces definitions with base links definitions
|
|
490
|
+
|
|
491
|
+
workspaceDefsBaseJSON.forEach((wp) => {
|
|
492
|
+
if (wp.baseLinkDefs) {
|
|
493
|
+
wp.baseLinkDefs.forEach((wpLink) => {
|
|
494
|
+
workspaceLinks.push({
|
|
495
|
+
...wpLink,
|
|
496
|
+
workspace: wp.id
|
|
497
|
+
});
|
|
498
|
+
});
|
|
499
|
+
}
|
|
500
|
+
});
|
|
501
|
+
|
|
502
|
+
tools.logInfo('Workspaces links generated :');
|
|
503
|
+
console.log(workspaceLinks);
|
|
504
|
+
|
|
505
|
+
const globalLinks = [
|
|
506
|
+
...routeDefsBaseLinksJSON,
|
|
507
|
+
...workspaceLinks,
|
|
508
|
+
];
|
|
509
|
+
|
|
510
|
+
|
|
479
511
|
// processing each link and matching route from routes base data definitions
|
|
480
512
|
|
|
481
513
|
const linksGenerated = [];
|
|
482
514
|
|
|
483
|
-
|
|
515
|
+
globalLinks.forEach((link) => {
|
|
484
516
|
let newLink = null;
|
|
485
517
|
|
|
486
518
|
if (link.parentId) {
|