@eui/tools 6.7.0 → 6.7.2

package/.version.properties

@@ -1 +1 @@
-6.7.0
+6.7.2

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.7.2 (2023-03-07)
+
+##### Chores
+
+* **other:**
+  * mwp v15 custom installation - Phase 2 - WIP - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([981bfc57](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/981bfc575501099c0d7d1479042ce22d5118918d))
+
+* * *
+* * *
+## 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

package/package.json

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

package/scripts/app/public/index.html

@@ -35,7 +35,7 @@
                             <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" v-model="selectedApp">
+                                    <select disabled class="form-select" v-model="selectedProject">
                                         <option value="my-workplace">MyWorkplace</option>
                                     </select>
                                 </div>
@@ -87,7 +87,7 @@
                                                 type="checkbox"
                                                 :value="remote.name"
                                                 :id="remote.name"
-                                                v-model="selectedLocalRemotes" />
+                                                v-model="selectedRemotes" />
                                         </div>
                                     </td>
                                     <td>
@@ -109,9 +109,9 @@
                 <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>
+                        <span class="text-primary fw-bold">{{ selectedRemotes.length }}</span>
                     </h5>
-                    {{ selectedLocalRemotes }}
+                    {{ selectedRemotes }}
                     <h5 class="mt-5 mb-3">
                         Selected local remotes (intialized as dependencies):
                         <span class="text-primary fw-bold">{{ selectedInstalledRemotes.length }}</span>
@@ -135,7 +135,7 @@
                     <button
                         class="btn btn-primary"
                         type="button"
-                        :disabled="selectedLocalRemotes.length === 0 && selectedInstalledRemotes.length === 0"
+                        :disabled="selectedRemotes.length === 0 && selectedInstalledRemotes.length === 0"
                         @click="saveConfig()">
                         Save configuration
                     </button>

package/scripts/app/public/index.js

@@ -12,10 +12,10 @@ new Vue({
     el: "#app",
     data() {
         return {
-            selectedApp: "my-workplace-host-playground-custom",
+            selectedProject: "my-workplace-host-playground-custom",
             selectedEuiVersion: "15.x",
             remotes: [],
-            selectedLocalRemotes: [],
+            selectedRemotes: [],
             selectedInstalledRemotes: [],
             deps: [],
             packages: [],
@@ -38,9 +38,9 @@ new Vue({
             const finalRes = await res.json();
 
             if (Object.keys(finalRes).length !== 0) {
-                this.selectedApp = finalRes.app;
+                this.selectedApp = finalRes.project;
                 this.selectedEuiVersion = finalRes.euiVersion;
-                this.selectedLocalRemotes = finalRes.localRemotes;
+                this.selectedLocalRemotes = finalRes.remotes;
                 this.selectedInstalledRemotes = finalRes.installedRemotes;
                 this.deps = finalRes.deps;
                 this.packages = finalRes.packages;
@@ -67,9 +67,9 @@ new Vue({
             const res = await fetch(
                 "http://localhost:3000/api/config",
                 getRequestBody({
-                    app: this.selectedApp,
+                    project: this.selectedProject,
                     euiVersion: this.selectedEuiVersion,
-                    localRemotes: this.selectedLocalRemotes,
+                    remotes: this.selectedRemotes,
                     installedRemotes: this.selectedInstalledRemotes,
                     deps: this.deps,
                     packages: this.packages,

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

@@ -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

@@ -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/csdr/cli/package-build-frontend.js

@@ -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

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/.eslintrc.json

@@ -0,0 +1,79 @@
+{
+    "extends": "../../.eslintrc.json",
+    "ignorePatterns": [
+        "!**/*",
+        "**/*.d.ts",
+        "dist"
+    ],
+    "overrides": [
+        {
+            "files": [
+                "*.ts"
+            ],
+            "parserOptions": {
+                "createDefaultProgram": true
+            },
+            "rules": {
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": "@module.scope.string@",
+                        "style": "kebab-case"
+                    }
+                ],
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": "@module.scope.string@",
+                        "style": "camelCase"
+                    }
+                ],
+                "@typescript-eslint/ban-ts-comment": "off",
+                "@typescript-eslint/ban-types": "error",
+                "@typescript-eslint/consistent-type-definitions": "off",
+                "@typescript-eslint/dot-notation": "off",
+                "@typescript-eslint/explicit-member-accessibility": [
+                    "off",
+                    {
+                        "accessibility": "explicit"
+                    }
+                ],
+                "@typescript-eslint/no-inferrable-types": "off",
+                "@typescript-eslint/no-unused-vars": "off",
+                "@typescript-eslint/no-var-requires": "error",
+                "@typescript-eslint/require-await": "error",
+                "id-blacklist": "off",
+                "id-match": "off",
+                "max-len": [
+                    "error",
+                    {
+                        "code": 160
+                    }
+                ],
+                "no-duplicate-case": "error",
+                "no-duplicate-imports": "off",
+                "no-invalid-this": "error",
+                "no-multiple-empty-lines": [
+                    "error",
+                    {
+                        "max": 1
+                    }
+                ],
+                "no-new-func": "error",
+                "no-template-curly-in-string": "error",
+                "no-underscore-dangle": "off",
+                "no-var": "off",
+                "prefer-const": "off",
+                "comma-dangle": "off"
+            }
+        },
+        {
+            "files": [
+                "*.html"
+            ],
+            "rules": {}
+        }
+    ]
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/assets/i18n/en.json

@@ -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/participant/assets/i18n/fr.json

@@ -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/participant/dependencies-base.json

@@ -0,0 +1,2 @@
+{
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/dependencies-composite.json

@@ -0,0 +1,3 @@
+{
+    "@eui/deps-base": "^15.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/gitignore_TO_REPLACE

@@ -0,0 +1,46 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+**/node_modules
+**/target
+**/build
+**/dist
+**/out-tsc
+**/tmp
+**/test/reports
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+yarn-error.log
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+**/src/**/*.js
+**/src/**/*.map
+
+# System Files
+.DS_Store
+Thumbs.db

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/karma.conf.js

@@ -0,0 +1,7 @@
+const karmaConfig = require('@eui/tools/karma/karma.conf.pkg');
+
+module.exports = function (config) {
+    config.set(
+        karmaConfig.get(config, '@module.full.name@', {})
+    );
+};

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "./dist",
+  "lib": {
+    "entryFile": "src/index.ts"
+  }
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@module.scope@/@module.name@",
+  "version": "1.0.0"
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/src/index.ts

@@ -0,0 +1,4 @@
+export { @module.class.name@Module } from './lib/module';
+
+export { MainParticipantModule } from './lib/main/module';
+export { @module.class.name@ContainerComponent } from './lib/main/containers/container.component';

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{blocks → src/lib/blocks}/sample/module.ts

@@ -33,5 +33,5 @@ const CONTAINERS = [
         ContainerComponent,
     ],
 })
-export class CreateDossierModule {
+export class @module.class.name@BlockSampleModule {
 }

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/src/lib/main/components/sample.component.ts

@@ -0,0 +1,14 @@
+import { Component, Input } from '@angular/core';
+
+import { Block } from '../models';
+
+@Component({
+    selector: '@module.scope-name@-cp',
+    templateUrl: './sample.component.html',
+})
+export class @module.class.name@Component {
+    @Input() block: Block;
+
+    constructor() {
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/src/lib/main/constants.ts

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

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{main → src/lib/main}/containers/block-store.service.ts

@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import * as block from '../store/actions/block.actions';
 
 import {
-    DecideBlock,
+    Block,
 } from '../models';
 
 import * as fromBlockReducer from '../store/reducers/block.reducer';
@@ -19,11 +19,11 @@ export class BlockStoreService {
     constructor(private store$: Store<fromBlockReducer.State>) {
     }
 
-    getBlockById(id: string): Observable<DecideBlock> {
+    getBlockById(id: string): Observable<Block> {
         return this.store$.pipe(select(fromBlockSelectors.getBlockById(id)));
     }
 
-    upsertBlock(b: DecideBlock): void {
+    upsertBlock(b: Block): void {
         this.store$.dispatch(new block.UpsertBlock({ block: b }));
     }
 

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{main/containers/decide.container.ts → src/lib/main/containers/container.component.ts}

@@ -4,27 +4,27 @@ import { Observable } from 'rxjs';
 
 import { BlockComponent, GENERIC_BLOCK_RESOLVER_TOKEN } from '@cc/shared';
 
-import { DecideBlock } from '../models';
+import { Block } from '../models';
 
 import { BlockStoreService } from './block-store.service';
 import { GenericBlockResolverService } from './generic-block-resolver.service';
 
 @Component({
-    selector: 'cc-decide-participant-ct',
+    selector: '@module.scoe-name@-ct',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         BlockStoreService,
         { provide: GENERIC_BLOCK_RESOLVER_TOKEN, useClass: GenericBlockResolverService },
     ],
     template: `
-        <cc-decide-cp
+        <@module.scope-name@-cp
             [block]="block$ | async">
-        </cc-decide-cp>`,
+        </@module.scope-name@-cp>`,
 })
-export class DecideParticipantContainerComponent implements BlockComponent, OnInit, OnDestroy {
-    @Input() readonly block: DecideBlock;
+export class @module.class.name@ContainerComponent implements BlockComponent, OnInit, OnDestroy {
+    @Input() readonly block: Block;
 
-    block$: Observable<DecideBlock>;
+    block$: Observable<Block>;
 
     constructor(private blockStore: BlockStoreService) {
     }

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{main → src/lib/main}/containers/generic-block-resolver.service.ts

@@ -4,10 +4,10 @@ import { CONFIG_TOKEN } from '@eui/core';
 
 import { BlockConfig, IGenericBlock, UnknownBlockComponent } from '@cc/shared';
 
-// DECIDE BLOCKS
-import { CreateDossierContainerComponent } from '../../blocks/create-dossier/containers/create-dossier.container';
+// BLOCKS
+import { ContainerComponent } from '../../blocks/sample/containers/container.component';
 
-import { DecideBlockType } from '../models';
+import { BlockType } from '../models';
 
 @Injectable()
 export class GenericBlockResolverService implements IGenericBlock {
@@ -17,8 +17,8 @@ export class GenericBlockResolverService implements IGenericBlock {
 
     getComponentForBlock(block: BlockConfig): any {
         switch (block?.config.subType) {
-            case DecideBlockType.CreateDossier: {
-                return CreateDossierContainerComponent;
+            case BlockType.@module.class.name@: {
+                return ContainerComponent;
             }
             default: {
                 return UnknownBlockComponent;

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/src/lib/main/models/block-type.model.ts

@@ -0,0 +1,6 @@
+/**
+ * Sub-blocks
+ */
+export class BlockType {
+    static @module.class.name@ = '@module.class.name@';
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/src/lib/main/models/block.model.ts

@@ -0,0 +1,10 @@
+import { ParticipantBlock } from '@cc/shared';
+
+import { BlockType } from './block-type.model';
+
+export interface Block extends ParticipantBlock {
+
+    config: {
+        subType: BlockType;
+    }
+}

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/src/lib/main/models/index.ts

@@ -0,0 +1,2 @@
+export * from './block.model';
+export * from './block-type.model';

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{main → src/lib/main}/module.ts

@@ -8,17 +8,17 @@ import { TranslateModule } from '@ngx-translate/core';
 import { CcSharedModule } from '@cc/shared';
 
 // -- Components --
-import { DecideComponent } from './components/decide.component';
+import { @module.class.name@Component } from './components/sample.component';
 
 const COMPONENTS = [
-    DecideComponent,
+    @module.class.name@Component,
 ];
 
 // -- Containers --
-import { DecideParticipantContainerComponent } from './containers/decide.container';
+import { @module.class.name@ContainerComponent } from './containers/container.component';
 
 const CONTAINERS = [
-    DecideParticipantContainerComponent,
+    @module.class.name@ContainerComponent,
 ];
 
 // -- Effects --
@@ -53,7 +53,7 @@ import { namespace } from './constants';
         ...SERVICES,
     ],
     exports: [
-        DecideParticipantContainerComponent,
+        @module.class.name@ContainerComponent,
     ],
 })
 export class MainParticipantModule {

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/src/lib/main/store/actions/block.actions.ts

@@ -0,0 +1,26 @@
+import { Action } from '@ngrx/store';
+
+import { Block } from '../../models';
+
+export enum BlockActionType {
+    UPSERT_BLOCK = '[@module.class.name@ - Block] Upsert block',
+    REMOVE_BLOCK = '[@module.class.name@ - Block] Remove block',
+}
+
+export class UpsertBlock implements Action {
+    readonly type = BlockActionType.UPSERT_BLOCK;
+
+    constructor(public payload: { block: Block }) {
+    }
+}
+
+export class RemoveBlock implements Action {
+    readonly type = BlockActionType.REMOVE_BLOCK;
+
+    constructor(public payload: { id: string }) {
+    }
+}
+
+export type BlockActions =
+    UpsertBlock |
+    RemoveBlock;

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{main → src/lib/main}/store/reducers/block.reducer.ts

@@ -2,27 +2,27 @@ import { createSelector } from '@ngrx/store';
 import { createEntityAdapter, Dictionary, EntityAdapter, EntityState } from '@ngrx/entity';
 
 import {
-    DecideBlockActionType,
+    BlockActionType,
     BlockActions,
 } from '../actions/block.actions';
 
-import { DecideBlock } from '../../models';
+import { Block } from '../../models';
 
-export interface State extends EntityState<DecideBlock> {
+export interface State extends EntityState<Block> {
 }
 
-export const adapter: EntityAdapter<DecideBlock> = createEntityAdapter<DecideBlock>({
-    selectId: (block: DecideBlock) => block.id,
+export const adapter: EntityAdapter<Block> = createEntityAdapter<Block>({
+    selectId: (block: Block) => block.id,
 });
 
 export const initialState: State = adapter.getInitialState({});
 
 export function reducer(state = initialState, action: BlockActions): State {
     switch (action.type) {
-        case DecideBlockActionType.UPSERT_BLOCK: {
+        case BlockActionType.UPSERT_BLOCK: {
             return adapter.upsertOne(action.payload.block, state);
         }
-        case DecideBlockActionType.REMOVE_BLOCK: {
+        case BlockActionType.REMOVE_BLOCK: {
             return adapter.removeOne(action.payload.id, state);
         }
         default: {
@@ -41,7 +41,7 @@ export const {
 export const getEntityById = (id: string) => {
     return createSelector(
         getEntities,
-        (entities: Dictionary<DecideBlock>) => {
+        (entities: Dictionary<Block>) => {
             return entities[id];
         },
     );

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{main → src/lib/main}/store/reducers/index.ts

@@ -9,7 +9,7 @@ export interface State {
 
 // -----------------
 // ------------ AOT
-export const TOKEN = new InjectionToken<ActionReducerMap<State>>('ccDecideReducers');
+export const TOKEN = new InjectionToken<ActionReducerMap<State>>('@module.class.name@Reducers');
 
 export function getReducers(): ActionReducerMap<State, any> {
     return {

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{main → src/lib/main}/store/selectors/block.selectors.ts

@@ -7,17 +7,17 @@ import { State } from '../reducers';
 
 import * as fromBlock from '../reducers/block.reducer';
 
-import { DecideBlock } from '../../models';
+import { Block } from '../../models';
 
 import { namespace } from '../../constants';
 
 // -----------------
 // --- feature selector
-const getCcDecideState = createFeatureSelector<State>(namespace);
+const get@module.class.name@State = createFeatureSelector<State>(namespace);
 
 // -----------------
 // ----- block
-const getBlockState = createSelector(getCcDecideState, state => {
+const getBlockState = createSelector(get@module.class.name@State, state => {
     return state.block;
 });
 

package/scripts/csdr/cli/skeletons/package/frontend/15.x/participant/{module.ts → src/lib/module.ts}

@@ -2,16 +2,16 @@ import { NgModule } from '@angular/core';
 
 import { MainParticipantModule } from './main/module';
 
-import { CreateDossierModule } from './blocks/create-dossier/module';
+import { @module.class.name@BlockSampleModule } from './blocks/sample/module';
 
 @NgModule({
     imports: [
         MainParticipantModule,
-        CreateDossierModule,
+        @module.class.name@BlockSampleModule,
     ],
     exports: [
         MainParticipantModule,
     ],
 })
-export class DecideParticipantModule {
+export class @module.class.name@Module {
 }