npm - @eui/tools - Versions diffs - 6.6.2 → 6.7.1 - Mend

@eui/tools 6.6.2 → 6.7.1

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.

Files changed (71) hide show

package/.version.properties CHANGED Viewed

	@@ -1 +1 @@
1	- 6.6.2
1	+ 6.7.1

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,21 @@
+## 6.7.1 (2023-03-06)
+##### Bug Fixes
+* **other:**
+  * participant skeleton for new package v15 creation - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([778ad270](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/778ad270965e92d7fb452efdf3151a7af8fe4689))
+* * *
+* * *
+## 6.7.0 (2023-03-06)
+##### New Features
+* **other:**
+  * new participant and default pkg skeletons for v15 - adapted init-custom app generated json - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([dd351337](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/dd351337631dd934f1c3b067e22122effb8e8987))
+* * *
+* * *
 ## 6.6.2 (2023-03-06)
 ##### Chores

package/package.json CHANGED Viewed

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

package/scripts/app/public/index.html CHANGED Viewed

@@ -26,7 +26,7 @@
     <body>
         <div id="app" class="container-fluid">
             <div class="row">
-                <div class="col-4 full-height-flex">
+                <div class="col-6 full-height-flex">
                     <h3 class="mt-2 mb-4">CSDR custom installation (experimental)</h3>
                     <div class="header-flex">
@@ -35,20 +35,16 @@
                             <div class="row mb-3">
                                 <label class="col-sm-2 col-form-label">App</label>
                                 <div class="col-sm-10">
-                                    <select disabled class="form-select">
-                                        <option>Open this select menu</option>
-                                        <option selected value="my-workplace">MyWorkplace</option>
-                                        <!-- <option value="sedia">Sedia</option> -->
+                                    <select disabled class="form-select" v-model="selectedApp">
+                                        <option value="my-workplace">MyWorkplace</option>
                                     </select>
                                 </div>
                             </div>
                             <div class="row mb-3">
                                 <label class="col-sm-2 col-form-label">eUI Version</label>
                                 <div class="col-sm-10">
-                                    <select disabled class="form-select">
-                                        <option>Open this select menu</option>
-                                        <option selected value="15.x">eUI 15</option>
-                                        <!-- <option value="10.x">eUI 10</option> -->
+                                    <select dis abled class="form-select" v-model="selectedEuiVersion">
+                                        <option value="15.x">eUI 15</option>
                                     </select>
                                 </div>
                             </div>
@@ -66,32 +62,42 @@
                         <table class="table table-striped" v-show="remotes.length !== 0">
                             <thead>
                                 <tr>
-                                    <th scope="col">&nbsp;</th>
                                     <th scope="col">Remote</th>
-                                    <th scope="col">Participant ?</th>
-                                    <th scope="col">Full skel.?</th>
+                                    <th scope="col">Participant</th>
+                                    <th scope="col">Full SK</th>
+                                    <th scope="col">Local</th>
+                                    <th scope="col">Installed</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr v-for="remote in remotes">
+                                    <td>{{ remote.name }}</td>
+                                    <td>
+                                        <div :class="{ 'text-primary fw-bold': remote.participant }">{{ remote.participant }}</div>
+                                    </td>
                                     <td>
-                                        <div class="form-check" :key="remote.name">
+                                        <div :class="{ 'text-success fw-bold': remote.fullSkeletonSources }">
+                                            {{ remote.fullSkeletonSources }}
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div class="form-check form-switch">
                                             <input
                                                 class="form-check-input"
                                                 type="checkbox"
                                                 :value="remote.name"
                                                 :id="remote.name"
-                                                v-model="selectedRemotes"
-                                                @change="remoteSelected($event)" />
+                                                v-model="selectedLocalRemotes" />
                                         </div>
                                     </td>
-                                    <td>{{ remote.name }}</td>
-                                    <td>
-                                        <div :class="{ 'text-primary fw-bold': remote.participant }">{{ remote.participant }}</div>
-                                    </td>
                                     <td>
-                                        <div :class="{ 'text-success fw-bold': remote.fullSkeletonSources }">
-                                            {{ remote.fullSkeletonSources }}
+                                        <div class="form-check form-switch">
+                                            <input
+                                                class="form-check-input"
+                                                type="checkbox"
+                                                :value="remote.name"
+                                                :id="remote.name"
+                                                v-model="selectedInstalledRemotes" />
                                         </div>
                                     </td>
                                 </tr>
@@ -100,12 +106,17 @@
                     </div>
                 </div>
-                <div class="col-8">
+                <div class="col-6">
+                    <h5 class="mt-5 mb-3">
+                        Selected local remotes (intialized as sources):
+                        <span class="text-primary fw-bold">{{ selectedLocalRemotes.length }}</span>
+                    </h5>
+                    {{ selectedLocalRemotes }}
                     <h5 class="mt-5 mb-3">
-                        Selected remotes :
-                        <span class="text-primary fw-bold">{{ selectedRemotes.length }}</span>
+                        Selected local remotes (intialized as dependencies):
+                        <span class="text-primary fw-bold">{{ selectedInstalledRemotes.length }}</span>
                     </h5>
-                    {{ selectedRemotes }}
+                    {{ selectedInstalledRemotes }}
                     <h5 class="mt-5 mb-3">
                         Derived dependencies:
@@ -119,15 +130,13 @@
                     </h5>
                     {{ packages }}
-                    <h5 class="mt-5 mb-3">
-                        Remotes to install as dependencies :
-                        <span class="text-primary fw-bold">{{ remotesToInstall.length }}</span>
-                    </h5>
-                    {{ remotesToInstall }}
                     <hr />
-                    <button class="btn btn-primary" type="button" :disabled="selectedRemotes.length === 0" @click="saveConfig()">
+                    <button
+                        class="btn btn-primary"
+                        type="button"
+                        :disabled="selectedLocalRemotes.length === 0 && selectedInstalledRemotes.length === 0"
+                        @click="saveConfig()">
                         Save configuration
                     </button>

package/scripts/app/public/index.js CHANGED Viewed

@@ -12,11 +12,13 @@ new Vue({
     el: "#app",
     data() {
         return {
+            selectedApp: "my-workplace-host-playground-custom",
+            selectedEuiVersion: "15.x",
             remotes: [],
-            selectedRemotes: [],
+            selectedLocalRemotes: [],
+            selectedInstalledRemotes: [],
             deps: [],
             packages: [],
-            remotesToInstall: [],
             saveConfigSubmitted: false,
             saveConfigOK: false,
         };
@@ -30,43 +32,33 @@ new Vue({
             const res = await fetch("http://localhost:3000/api/remotes");
             const finalRes = await res.json();
             this.remotes = finalRes;
-            this.getRemotesToInstall();
         },
         async getConfig() {
             const res = await fetch("http://localhost:3000/api/config");
             const finalRes = await res.json();
-            if (finalRes.selectedRemotes) {
-                this.selectedRemotes = finalRes.selectedRemotes;
+            if (Object.keys(finalRes).length !== 0) {
+                this.selectedApp = finalRes.app;
+                this.selectedEuiVersion = finalRes.euiVersion;
+                this.selectedLocalRemotes = finalRes.localRemotes;
+                this.selectedInstalledRemotes = finalRes.installedRemotes;
                 this.deps = finalRes.deps;
                 this.packages = finalRes.packages;
-                this.remotesToInstall = finalRes.remotesToInstall;
             }
         },
         async getPackages() {
-            const res = await fetch("http://localhost:3000/api/remotes/packages", getRequestBody(this.selectedRemotes));
+            const res = await fetch("http://localhost:3000/api/remotes/packages", getRequestBody(this.selectedLocalRemotes));
             const finalRes = await res.json();
             this.packages = finalRes.packages.filter(
                 (p) => p.indexOf("csdr-") < 0 && p.indexOf("cc-shared-ui") < 0 && p.indexOf("mywp-shared-ui") < 0
             );
             this.deps = finalRes.deps;
-            this.getRemotesToInstall();
-        },
-        remoteSelected(event) {
-            this.getPackages();
-            this.saveConfigSubmitted = false;
-        },
-        getRemotesToInstall() {
-            this.remotesToInstall = this.remotes
-                .map((r) => r.name)
-                .filter((r) => {
-                    return !this.selectedRemotes.includes(r);
-                });
         },
         reset() {
-            this.selectedRemotes = [];
+            this.selectedLocalRemotes = [];
+            this.selectedInstalledRemotes = [];
             this.packages = [];
             this.deps = [];
-            this.remotesToInstall = [];
             this.saveConfigOK = false;
             this.saveConfigSubmitted = false;
         },
@@ -75,10 +67,12 @@ new Vue({
             const res = await fetch(
                 "http://localhost:3000/api/config",
                 getRequestBody({
-                    selectedRemotes: this.selectedRemotes,
+                    app: this.selectedApp,
+                    euiVersion: this.selectedEuiVersion,
+                    localRemotes: this.selectedLocalRemotes,
+                    installedRemotes: this.selectedInstalledRemotes,
                     deps: this.deps,
                     packages: this.packages,
-                    remotesToInstall: this.remotesToInstall,
                 })
             );
@@ -88,8 +82,23 @@ new Vue({
                 this.saveConfigOK = true;
             }
             this.saveConfigSubmitted = true;
-            const finalRes = await res.json();
+        },
+    },
+    watch: {
+        selectedLocalRemotes: {
+            handler: function (val) {
+                this.saveConfigOK = false;
+                this.saveConfigSubmitted = false;
+                this.getPackages();
+            },
+            deep: true,
+        },
+        selectedInstalledRemotes: {
+            handler: function (val) {
+                this.saveConfigOK = false;
+                this.saveConfigSubmitted = false;
+            },
+            deep: true,
         },
     },
 });

package/scripts/app/public/package-init.html CHANGED Viewed

@@ -86,6 +86,17 @@
                                         v-model="params.externalRepoName" />
                                 </div>
                             </div>
+                            <div class="row mt-3 mb-3">
+                                <div class="col-sm-4">
+                                    <label class="form-check-label d-flex justify-content-end"> Participant package type ?</label>
+                                </div>
+                                <div class="col-sm-8">
+                                    <div class="form-check form-switch">
+                                        <input class="form-check-input" type="checkbox" v-model="params.pkgFrontendParticipant" />
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                         <div v-if="params.pkgFrontendType === 'remote'">

package/scripts/app/public/package-init.js CHANGED Viewed

@@ -46,6 +46,7 @@ new Vue({
                 pkgScope: "@zzz",
                 pkgName: "my-package",
                 csdrRepo: true,
+                pkgFrontendParticipant: false,
                 pkgGroupId: "eu.europa.ec.cc",
                 remoteConfig: {
                     rmTeamName: "cc-digit-ui-rm",
@@ -127,6 +128,7 @@ new Vue({
                     if (!params.csdrRepo) {
                         params.externalRepoName = this.params.externalRepoName;
                     }
+                    params.pkgFrontendParticipant = this.params.pkgFrontendParticipant;
                 } else {
                     params.remoteConfig = this.params.remoteConfig;
                 }

package/scripts/app/routes/index.js CHANGED Viewed

@@ -40,65 +40,65 @@ router.get('/remotes', function (req, res) {
     })
 });
-router.get('/remotes/stats', function (req, res) {
+router.post('/remotes/packages', function (req, res) {
   return Promise.resolve()
     .then(() => {
-      return metadataUtils.stats.getRemoteAllStats();
-    })
-    .then((stats) => {
-      res.send(stats);
+      const remotes = req.body;
+      const depsPackages = configUtils.remotes.getRemotesPackages(remotes);
+      res.send(depsPackages);
     })
     .catch((e) => {
       handlerError(res, e);
     })
 });
-router.post('/remotes/packages', function (req, res) {
+router.get('/config', function (req, res) {
   return Promise.resolve()
     .then(() => {
-      const remotes = req.body;
-      const depsPackages = configUtils.remotes.getRemotesPackages(remotes);
-      res.send(depsPackages);
+      return configUtils.global.getCustomConfig();
+    })
+    .then((customConfig) => {
+      res.send(customConfig);
     })
     .catch((e) => {
       handlerError(res, e);
     })
 });
-router.post('/remotes/stats', function (req, res) {
+router.post('/config', function (req, res) {
   return Promise.resolve()
     .then(() => {
-      return metadataUtils.stats.getRemoteStats(req.body.remote);
+      return configUtils.global.generateCustomConfig(req.body);
     })
-    .then((remoteStats) => {
-      res.send(remoteStats);
+    .then(() => {
+      res.status(200);
+      res.send({ status: 'OK'})
     })
     .catch((e) => {
       handlerError(res, e);
     })
 });
-router.get('/config', function (req, res) {
+router.get('/remotes/stats', function (req, res) {
   return Promise.resolve()
     .then(() => {
-      return configUtils.global.getCustomConfig();
+      return metadataUtils.stats.getRemoteAllStats();
     })
-    .then((customConfig) => {
-      res.send(customConfig);
+    .then((stats) => {
+      res.send(stats);
     })
     .catch((e) => {
       handlerError(res, e);
     })
 });
-router.post('/config', function (req, res) {
+router.post('/remotes/stats', function (req, res) {
   return Promise.resolve()
     .then(() => {
-      return configUtils.global.generateCustomConfig(req.body);
+      return metadataUtils.stats.getRemoteStats(req.body.remote);
     })
-    .then(() => {
-      res.status(200);
-      res.send({ status: 'OK'})
+    .then((remoteStats) => {
+      res.send(remoteStats);
     })
     .catch((e) => {
       handlerError(res, e);

package/scripts/csdr/cli/constants.js CHANGED Viewed

@@ -5,7 +5,8 @@ const path = require('path');
 module.exports.TARGET_ROOT_PATH = path.join(process.cwd(), 'packages');
 module.exports.TARGET_ROOT_REMOTES_PATH = path.join(process.cwd(), 'remotes');
 module.exports.SKELETONS_ROOT_PATH = path.join(__dirname, 'skeletons', 'package');
-module.exports.FRONTEND_SKELETON_EUI15_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend-eui15');
+module.exports.FRONTEND_SKELETON_EUI15_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '15.x', 'default');
+module.exports.FRONTEND_SKELETON_EUI15_PARTICIPANT_PATH = path.join(this.SKELETONS_ROOT_PATH, 'frontend', '15.x', 'participant');
 module.exports.BACKEND_SKELETON_PATH = path.join(this.SKELETONS_ROOT_PATH, 'backend');
 module.exports.VIRTUAL_REMOTE_SKELETON_ROOT_PATH = path.join(__dirname, 'skeletons', 'virtual-remote');

package/scripts/csdr/cli/package-build-frontend.js CHANGED Viewed

@@ -40,7 +40,7 @@ const replaceContent = (targetPath, name, scope, fullName) => {
   tools.replaceInPath(targetPath, '@module.scope@', scope);
   tools.replaceInPath(targetPath, '@module.scope-name@', `${scope.substr(1)}-${name}`);
   tools.replaceInPath(targetPath, '@module.scope.string@', scope.substr(1));
-  tools.replaceInPath(targetPath, '@module.class.name@', tools.camelCaseString(name, '-', true));
+  tools.replaceInPath(targetPath, '@module.class.name@', tools.camelCaseString(`${scope.substr(1)}-${name}`, '-', true));
 }
@@ -140,7 +140,11 @@ const generateDefault = (args = constants.DEFAULT_CONFIG) => {
     .then(() => {
       tools.logInfo('Copying skeleton to target');
       if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15) {
-        tools.copydir(constants.FRONTEND_SKELETON_EUI15_PATH, targetPath, true);
+        if (args.pkgFrontendParticipant) {
+          tools.copydir(constants.FRONTEND_SKELETON_EUI15_PARTICIPANT_PATH, targetPath, true);
+        } else {
+          tools.copydir(constants.FRONTEND_SKELETON_EUI15_PATH, targetPath, true);
+        }
       }
       // REPLACING PLACEHOLDERS
@@ -171,14 +175,6 @@ const generateDefault = (args = constants.DEFAULT_CONFIG) => {
       replaceExtensions(targetPath);
     })
-    .then(() => {
-      if (
-        args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15
-       ) {
-        return tools.remove(path.join(targetPath, 'tslint.json'));
-       }
-    })
     .then(() => {
       tools.logSuccess();
     })

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/assets/i18n/en.json ADDED Viewed

@@ -0,0 +1,6 @@
+{
+    "@module.scope-name@.TITLE": "@module.scope-name@",
+    "@module.scope-name@.FILTER": "Search filter",
+    "@module.scope-name@.QUICK_SECTION": "Quick filter",
+    "@module.scope-name@.SEARCH_RESULT": "Filter results"
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/assets/i18n/fr.json ADDED Viewed

@@ -0,0 +1,6 @@
+{
+    "@module.scope-name@.TITLE": "**fr** @module.scope-name@ **fr**",
+    "@module.scope-name@.FILTER": "**fr** Search filter **fr**",
+    "@module.scope-name@.QUICK_SECTION": "**fr** Quick filter **fr**",
+    "@module.scope-name@.SEARCH_RESULT": "**fr** Filter results **fr**"
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/src/index.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export { @module.class.name@Module, @module.class.name@CommonModule } from './lib/module';
2	+ export { RoutingModule, routes } from './lib/routing-module';

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/src/lib/components/main.component.html ADDED Viewed

@@ -0,0 +1,57 @@
+<eui-page>
+    <eui-page-header [label]="'@module.scope-name@.TITLE' | translate">
+        <eui-page-header-action-items>
+        </eui-page-header-action-items>
+    </eui-page-header>
+    <eui-page-content>
+        <eui-page-columns>
+            <eui-page-column
+                label="{{ '@module.scope-name@.FILTER' | translate }}"
+                [size]="'3xl'"
+                [isCollapsible]="true">
+                <eui-page-column-body>
+                    <!-- QUICK FILTER SECTION -->
+                    <div class="eui-u-flex eui-u-flex-column eui-u-mt-xs">
+                        <div class="eui-u-flex eui-u-flex-row">
+                            <div class="eui-u-font-size-l"><strong>{{ '@module.scope-name@.QUICK_SECTION' | translate }}</strong></div>
+                        </div>
+                    </div>
+                </eui-page-column-body>
+            </eui-page-column>
+            <eui-page-column>
+                <eui-page-column-header-left-content>
+                    <div class="eui-page-column__header-left-content-label">{{ '@module.scope-name@.SEARCH_RESULT' | translate }}</div>
+                </eui-page-column-header-left-content>
+                <eui-page-column-header-right-content>
+                    <div class="eui-u-flex">
+                        <button
+                            euiButton
+                            euiSecondary>
+                            <span euiIcon iconClass="eui-icon-refresh"></span>
+                            <span euiLabel>{{ '@module.scope-name@.CREATE_DOSSIER' | translate }}</span>
+                        </button>
+                    </div>
+                </eui-page-column-header-right-content>
+                <eui-page-column-header-body>
+                </eui-page-column-header-body>
+                <eui-page-column-body>
+                </eui-page-column-body>
+            </eui-page-column>
+        </eui-page-columns>
+    </eui-page-content>
+</eui-page>

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/src/lib/components/main.component.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import { Component, Input } from '@angular/core';
+@Component({
+    selector: '@module.scope-name@-cp',
+    templateUrl: './main.component.html',
+})
+export class @module.class.name@Component {
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/src/lib/constants.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export const namespace = '@module.class.name@:main';

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/src/lib/containers/container.component.ts ADDED Viewed

@@ -0,0 +1,28 @@
+import { ChangeDetectionStrategy, Component, Input, OnInit, OnDestroy } from '@angular/core';
+import { BreadcrumbsService } from '@csdr/core';
+@Component({
+    selector: '@module.scope-name@-ct',
+    changeDetection: ChangeDetectionStrategy.OnPush,
+    template: `
+        <@module.scope-name@-cp>
+        </@module.scope-name@-cp>`,
+})
+export class @module.class.name@ContainerComponent implements OnInit, OnDestroy {
+    constructor(private breadcrumbs: BreadcrumbsService) {
+    }
+    ngOnInit(): void {
+        this.breadcrumbs.removeAll();
+        this.breadcrumbs.addItem({
+            id: '@module.scope-name@',
+            description: '@module.class.name@',
+            url: '/@module.scope-name@',
+        });
+    }
+    ngOnDestroy(): void {
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/default/src/lib/module.ts ADDED Viewed

@@ -0,0 +1,79 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+// import { StoreModule } from '@ngrx/store';
+// import { EffectsModule } from '@ngrx/effects';
+import { TranslateModule } from '@ngx-translate/core';
+import { EuiButtonModule } from '@eui/components/eui-button';
+import { EuiPageModule } from '@eui/components/eui-page';
+import { CcSharedModule } from '@cc/shared';
+// -- Components --
+import { @module.class.name@Component } from './components/main.component';
+const COMPONENTS = [
+    @module.class.name@Component,
+];
+// -- Containers --
+import { @module.class.name@ContainerComponent } from './containers/container.component';
+const CONTAINERS = [
+    @module.class.name@ContainerComponent,
+];
+// -- Effects --
+const EFFECTS = [
+];
+// -- Reducer --
+// import { TOKEN, reducerProvider } from './store/reducers';
+// -- Services --
+const SERVICES = [
+];
+// -- Constants --
+import { namespace } from './constants';
+// -- Routes --
+import { RoutingModule } from './routing-module';
+@NgModule({
+    imports: [
+        CommonModule,
+        // StoreModule.forFeature(namespace, TOKEN),
+        // EffectsModule.forFeature(EFFECTS),
+        TranslateModule,
+        EuiButtonModule,
+        EuiPageModule,
+        CcSharedModule,
+    ],
+    declarations: [
+        ...COMPONENTS,
+        ...CONTAINERS,
+    ],
+    providers: [
+        // reducerProvider,
+        ...SERVICES,
+    ],
+    exports: [],
+})
+export class @module.class.name@CommonModule {
+}
+@NgModule({
+    imports: [
+        @module.class.name@CommonModule,
+        RoutingModule,
+    ],
+    exports: [
+        @module.class.name@CommonModule,
+    ],
+})
+export class @module.class.name@Module {
+}