@eui/tools 6.15.9 → 6.15.11

package/.version.properties

@@ -1 +1 @@
-6.15.9
+6.15.11

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.15.11 (2024-01-23)
+
+##### Chores
+
+* **other:**
+  * skeleton code cleanup MWP-10441 [MWP-10441](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-10441)  ([8200cfbc](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/8200cfbcab5905a65dabd04c07377e1a7d5b6f27))
+
+* * *
+* * *
+## 6.15.10 (2024-01-23)
+
+##### Chores
+
+* **other:**
+  * skeleton code cleanup MWP-10441 [MWP-10441](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-10441)  ([0ae2f152](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/0ae2f152da135a0796c24307417ede66366ed777))
+
+* * *
+* * *
 ## 6.15.9 (2024-01-17)
 
 ##### Chores

package/package.json

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

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

@@ -10,16 +10,17 @@
         <eui-page-columns>
 
             <eui-page-column
-                label="{{ '@module.scope-name@.FILTER' | translate }}"
+                [isCollapsible]="true"
                 [size]="'3xl'"
-                [isCollapsible]="true">
+                label="{{ '@module.scope-name@.FILTER' | translate }}">
 
                 <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 class="eui-u-font-size-l">
+                                <strong>{{ '@module.scope-name@.QUICK_SECTION' | translate }}</strong></div>
                         </div>
                     </div>
 

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/components/sample.component.html

@@ -1 +1 @@
-<cc-generic-block-ct [block]="block"></cc-generic-block-ct>
+<div>your participant</div>

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

@@ -8,7 +8,4 @@ import { Block } from '../models';
 })
 export class @module.class.name@Component {
     @Input() block: Block;
-
-    constructor() {
-    }
 }

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/containers/block-store.service.ts

@@ -1,33 +1,26 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Store, select } from '@ngrx/store';
 
 import { Observable } from 'rxjs';
 
-import * as block from '../store/actions/block.actions';
+import { Block } from '../models';
 
-import {
-    Block,
-} from '../models';
-
-import * as fromBlockReducer from '../store/reducers/block.reducer';
-
-import * as fromBlockSelectors from '../store/selectors/block.selectors';
+import { actions } from '../store/block.actions';
+import { feature } from '../store/block.feature';
 
 @Injectable()
 export class BlockStoreService {
-
-    constructor(private store$: Store<fromBlockReducer.State>) {
-    }
+    private store$ = inject(Store);
 
     getBlockById(id: string): Observable<Block> {
-        return this.store$.pipe(select(fromBlockSelectors.getBlockById(id)));
+        return this.store$.pipe(select(feature.getBlock(id)));
     }
 
     upsertBlock(b: Block): void {
-        this.store$.dispatch(new block.UpsertBlock({ block: b }));
+        this.store$.dispatch(actions.upsertBlock({ block: b }));
     }
 
     removeBlock(id: string): void {
-        this.store$.dispatch(new block.RemoveBlock({ id }));
+        this.store$.dispatch(actions.removeBlock({ id }));
     }
 }

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/containers/container.component.ts

@@ -2,19 +2,17 @@ import { ChangeDetectionStrategy, Component, Input, OnInit, OnDestroy } from '@a
 
 import { Observable } from 'rxjs';
 
-import { BlockComponent, GENERIC_BLOCK_RESOLVER_TOKEN } from '@cc/shared/block';
+import { BlockComponent } from '@cc/shared/block';
 
 import { Block } from '../models';
 
 import { BlockStoreService } from './block-store.service';
-import { GenericBlockResolverService } from './generic-block-resolver.service';
 
 @Component({
     selector: '@module.scoe-name@-ct',
     changeDetection: ChangeDetectionStrategy.OnPush,
     providers: [
         BlockStoreService,
-        { provide: GENERIC_BLOCK_RESOLVER_TOKEN, useClass: GenericBlockResolverService },
     ],
     template: `
         <@module.scope-name@-cp

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

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

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

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

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/module.ts

@@ -25,20 +25,17 @@ const CONTAINERS = [
 const EFFECTS = [
 ];
 
-// -- Reducer --
-import { TOKEN, reducerProvider } from './store/reducers';
+// -- Feature --
+import { feature } from './store/block.feature';
 
 // -- Services --
 const SERVICES = [
 ];
 
-// -- Constants --
-import { namespace } from './constants';
-
 @NgModule({
     imports: [
         CommonModule,
-        StoreModule.forFeature(namespace, TOKEN),
+        StoreModule.forFeature(feature),
         EffectsModule.forFeature(EFFECTS),
         TranslateModule,
 
@@ -49,7 +46,6 @@ import { namespace } from './constants';
         ...CONTAINERS,
     ],
     providers: [
-        reducerProvider,
         ...SERVICES,
     ],
     exports: [

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

@@ -0,0 +1,11 @@
+import { createActionGroup, props } from '@ngrx/store';
+
+import { Block } from '../models';
+
+export const actions = createActionGroup({
+    source: `@module.class.name@_block`,
+    events: {
+        upsertBlock: props<{ block: Block }>(),
+        removeBlock: props<{ id: string }>(),
+    },
+});

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/store/block.feature.ts

@@ -0,0 +1,48 @@
+import { createFeature, createReducer, on, createSelector } from '@ngrx/store';
+import { createEntityAdapter, EntityState } from '@ngrx/entity';
+
+import { Block } from '../models';
+
+import { actions } from './block.actions';
+
+const adapter = createEntityAdapter<Block>({
+    selectId: block => block.id,
+});
+
+interface State {
+    blocks: EntityState<Block>;
+}
+
+const initialState: State = {
+    blocks: adapter.getInitialState(),
+};
+
+export const feature = createFeature({
+    name: `@module.class.name@_block`,
+    reducer: createReducer(
+        initialState,
+        on(actions.upsertBlock, (state, action) => ({
+            ...state,
+            blocks: adapter.upsertOne(action.block, state.blocks),
+        })),
+        on(actions.removeBlock, (state, action) => ({
+            ...state,
+            blocks: adapter.removeOne(action.id, state.blocks),
+        })),
+    ),
+    extraSelectors: ({
+                         selectBlocks,
+                     }) => {
+        const getBlockEntities = createSelector(
+            selectBlocks,
+            adapter.getSelectors().selectEntities,
+        );
+        const getBlock = (id: string) => createSelector(
+            getBlockEntities,
+            entities => entities[id],
+        );
+        return {
+            getBlock,
+        };
+    },
+});

package/scripts/csdr/init/remotes/17.x/full/common/app/fallback.component.ts

@@ -4,8 +4,7 @@ import { Component } from '@angular/core';
     template: `
         <eui-block-content [isBlocked]="true">
             <div style="height: 100%"></div>
-        </eui-block-content>
-    `,
+        </eui-block-content>`,
 })
 export class FallbackComponent {
 }

package/scripts/csdr/init/remotes/17.x/full/common/app/module.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Inject, ElementRef, OnDestroy } from '@angular/core';
+import { Component, OnInit, ElementRef, OnDestroy, inject } from '@angular/core';
 
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
@@ -53,11 +53,10 @@ export class ModuleComponent implements OnInit, OnDestroy {
 
     private initSubscription: Subscription;
 
-    constructor(private elRef: ElementRef,
-                @Inject(CONFIG_TOKEN) public config: any,
-                private elementLifeCycleService: ElementLifeCycleService,
-                private elementSetupService: ElementSetupService) {
-    }
+    private elRef = inject(ElementRef);
+    private config = inject(CONFIG_TOKEN);
+    private elementLifeCycleService = inject(ElementLifeCycleService);
+    private elementSetupService = inject(ElementSetupService);
 
     ngOnInit() {
         const elementData = this.elementLifeCycleService.getElementData(this.elRef);

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/constants.ts

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

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/containers/generic-block-resolver.service.ts

@@ -1,32 +0,0 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { CONFIG_TOKEN } from '@eui/core';
-
-import { BlockConfig, IGenericBlock, UnknownBlockComponent } from '@cc/shared/block';
-
-// BLOCKS
-import { ContainerComponent } from '../../blocks/sample/containers/container.component';
-
-import { BlockType } from '../models';
-
-@Injectable()
-export class GenericBlockResolverService implements IGenericBlock {
-
-    constructor(@Inject(CONFIG_TOKEN) private config: any) {
-    }
-
-    getComponentForBlock(block: BlockConfig): any {
-        switch (block?.config.subType) {
-            case BlockType.@module.class.name@: {
-                return ContainerComponent;
-            }
-            default: {
-                return UnknownBlockComponent;
-            }
-        }
-    }
-
-    enrichBlock(block: BlockConfig): BlockConfig {
-        return block;
-    }
-}

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

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

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

@@ -1,26 +0,0 @@
-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/17.x/participant-ngrx/src/lib/main/store/reducers/block.reducer.ts

@@ -1,48 +0,0 @@
-import { createSelector } from '@ngrx/store';
-import { createEntityAdapter, Dictionary, EntityAdapter, EntityState } from '@ngrx/entity';
-
-import {
-    BlockActionType,
-    BlockActions,
-} from '../actions/block.actions';
-
-import { Block } from '../../models';
-
-export interface State extends EntityState<Block> {
-}
-
-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 BlockActionType.UPSERT_BLOCK: {
-            return adapter.upsertOne(action.payload.block, state);
-        }
-        case BlockActionType.REMOVE_BLOCK: {
-            return adapter.removeOne(action.payload.id, state);
-        }
-        default: {
-            return state;
-        }
-    }
-}
-
-export const {
-    selectIds: getIds,
-    selectEntities: getEntities,
-    selectAll: getAll,
-    selectTotal: getTotal,
-} = adapter.getSelectors();
-
-export const getEntityById = (id: string) => {
-    return createSelector(
-        getEntities,
-        (entities: Dictionary<Block>) => {
-            return entities[id];
-        },
-    );
-};

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/store/reducers/index.ts

@@ -1,22 +0,0 @@
-import { InjectionToken } from '@angular/core';
-import { ActionReducerMap } from '@ngrx/store';
-
-import * as fromBlock from './block.reducer';
-
-export interface State {
-    block: fromBlock.State;
-}
-
-// -----------------
-// ------------ AOT
-export const TOKEN = new InjectionToken<ActionReducerMap<State>>('@module.class.name@Reducers');
-
-export function getReducers(): ActionReducerMap<State, any> {
-    return {
-        block: fromBlock.reducer,
-    };
-}
-
-export const reducerProvider = [
-    { provide: TOKEN, useFactory: getReducers },
-];

package/scripts/csdr/cli/skeletons/package/frontend/17.x/participant-ngrx/src/lib/main/store/selectors/block.selectors.ts

@@ -1,29 +0,0 @@
-import {
-    createSelector,
-    createFeatureSelector,
-} from '@ngrx/store';
-
-import { State } from '../reducers';
-
-import * as fromBlock from '../reducers/block.reducer';
-
-import { Block } from '../../models';
-
-import { namespace } from '../../constants';
-
-// -----------------
-// --- feature selector
-const get@module.class.name@State = createFeatureSelector<State>(namespace);
-
-// -----------------
-// ----- block
-const getBlockState = createSelector(get@module.class.name@State, state => {
-    return state.block;
-});
-
-export const getBlockById = (id: string) => {
-    return createSelector(
-        getBlockState,
-        fromBlock.getEntityById(id),
-    );
-};