imng-kendo-schematics 19.178.2 → 19.179.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imng-kendo-schematics",
-  "version": "19.178.2",
+  "version": "19.179.2",
   "description": "Angular Schematics facilitating Angular, Kendo, NGRX and imng package integration",
   "scripts": {
     "build": "tsc -p tsconfig.json",

package/schematics/imng-crud/files/add.component.ts.template

@@ -1,5 +1,4 @@
 import { Component, ChangeDetectionStrategy, OnInit, OnDestroy } from '@angular/core';
-import { <%= classify(name) %>CrudFacade } from './crud.facade';
 import { <%= classify(name) %>BaseEntryComponent } from './base-entry.component';
 
 @Component({
@@ -13,9 +12,6 @@ export class <%= classify(name) %>AddComponent extends <%= classify(name) %>Base
   public dialogTitle = 'Add <%= classify(name) %>';
   public active$ = this.facade.isNewActive$;
 
-  constructor(facade: <%= classify(name) %>CrudFacade) {
-    super(facade);
-  }
   public override initForm(): void {
     super.initForm();
     this.addEditForm.patchValue({});

package/schematics/imng-crud/files/api.service.ts.template

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { NrsrxBaseApiClientService } from 'imng-nrsrx-client-utils';
-import { HttpClient } from '@angular/common/http';
 import { environment } from '@env';
 
 @Injectable({
@@ -12,7 +11,4 @@ export class <%= classify(name) %>ApiService extends NrsrxBaseApiClientService<I
   public override dateOnlyPropertyNames = [<% swaggerProperties.filter(t => t.format === 'date').forEach(function (swaggerProperty, index, dateProperties) {  %>
     <%= classify(singularizedName) %>Properties.<%= swaggerProperty.snakeCaseName.toUpperCase() %><% if (index + 1 < dateProperties.length) { %>,<% }}) %>];
 <% } %>
-  constructor(http: HttpClient) {
-    super(http);
-  }
 }

package/schematics/imng-crud/files/base-entry.component.ts.template

@@ -1,4 +1,4 @@
-import { OnInit, Component } from '@angular/core';
+import { OnInit, Component, inject } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { BaseDataEntryComponent } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
 import { BehaviorSubject, map, Observable, switchMap } from 'rxjs';<% } %>
@@ -18,9 +18,9 @@ export abstract class <%= classify(name) %>BaseEntryComponent extends BaseDataEn
   public readonly <%= camelize(swaggerProperty.pluralizedName) %>$ = new BehaviorSubject(<%= camelize(swaggerProperty.singularizedPropertyTypeName) %>Values);<% }) %>
   public addEditForm: FormGroup<I<%= classify(name) %>Form>;
 
-  constructor(facade: <%= classify(name) %>CrudFacade) {
-    super(facade);<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
-    this.<%= camelize(swaggerProperty.pluralizedName) %>$ = facade.<%= camelize(swaggerProperty.pluralizedName) %>$.pipe(
+  constructor() {
+    super(inject(<%= classify(name) %>CrudFacade));<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
+    this.<%= camelize(swaggerProperty.pluralizedName) %>$ = this.facade.<%= camelize(swaggerProperty.pluralizedName) %>$.pipe(
       switchMap(<%= camelize(swaggerProperty.pluralizedName) %> => this.<%= camelize(swaggerProperty.name) %>Filter$.pipe(
         map(<%= camelize(swaggerProperty.name) %>Filter => <%= camelize(swaggerProperty.name) %>Filter ? <%= camelize(swaggerProperty.pluralizedName) %>
           .filter(<%= camelize(swaggerProperty.name) %> => (<% swaggerProperty.properties.filter(f => f.name !== 'id' && f.htmlInputType !== 'object' && !f.hidden).forEach(function(swaggerSubProperty, i, arr){%>

package/schematics/imng-crud/files/crud.facade.ts.template

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { IDataEntryFacade } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
 import { ODataState } from 'imng-kendo-odata';<% } %>
@@ -6,14 +6,14 @@ import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(singularizedS
 
 @Injectable()
 export class <%= classify(name) %>CrudFacade implements IDataEntryFacade<I<%= classify(name) %>> {
+  private readonly store = inject(Store);
+
   loading$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectLoading);
   currentEntity$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectCurrent<%= classify(name) %>);
   isEditActive$ = this.store.select(<%= camelize(singularizedStoreName) %>Selectors.selectIsEdit<%= classify(name) %>Active);
   isNewActive$ = this.store.select(<%= camelize(singularizedStoreName) %>Selectors.selectIsNew<%= classify(name) %>Active);<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
   <%= camelize(swaggerProperty.pluralizedName) %>$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.select<%= classify(swaggerProperty.pluralizedName) %>);<% }); %>
 
-  constructor(private readonly store: Store) {}
-
   public setCurrentEntity(item: I<%= classify(name) %>): void {
     this.store.dispatch(<%= camelize(singularizedStoreName) %>ActionTypes.setCurrent<%= classify(name) %>(item));
   }

package/schematics/imng-crud/files/edit.component.ts.template

@@ -2,7 +2,6 @@ import { Component, ChangeDetectionStrategy, OnInit, OnDestroy } from '@angular/
 import { formGroupPatcher } from 'imng-kendo-data-entry';
 
 import { <%= classify(name) %>BaseEntryComponent } from './base-entry.component';
-import { <%= classify(name) %>CrudFacade } from './crud.facade';
 
 @Component({
   selector: '<%= appPrefix %>-<%= dasherize(name) %>-edit',
@@ -15,9 +14,6 @@ export class <%= classify(name) %>EditComponent extends <%= classify(name) %>Bas
   public dialogTitle = 'Edit <%= classify(name) %>';
   public active$ = this.facade.isEditActive$;
 
-  constructor(facade: <%= classify(name) %>CrudFacade) {
-    super(facade);
-  }
   public override initForm(): void {
     super.initForm();
     if (this.addEditForm) {

package/schematics/imng-list/files/list.component.ts.template

@@ -1,4 +1,4 @@
-import { Component, ChangeDetectionStrategy } from '@angular/core';
+import { Component, ChangeDetectionStrategy, inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { DetailExpandEvent } from '@progress/kendo-angular-grid';
 import { KendoODataBasedComponent } from 'imng-kendo-grid-odata';
@@ -15,15 +15,15 @@ import { <%= camelize(singularizedName) %>GridState } from './list.grid-state';
   standalone: false,
 })
 export class <%= classify(singularizedName) %>ListComponent extends KendoODataBasedComponent<I<%= classify(singularizedName) %>, <%= classify(singularizedName) %>ListFacade> {
+  public readonly crudFacade = inject(<%= classify(singularizedName) %>CrudFacade);
+
   public readonly props = <%= classify(singularizedName) %>Properties;<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
   public readonly <%= camelize(swaggerProperty.name) %>Props = <%= classify(swaggerProperty.propertyTypeName) %>Properties;<% }) %><% swaggerObjectProperties.filter(t=> t.enum).forEach(function(swaggerProperty){ %>
   public readonly <%= camelize(swaggerProperty.pluralizedPropertyTypeName) %> = <%= camelize(swaggerProperty.singularizedPropertyTypeName) %>Values;<% }) %>
   public currentItem: I<%= classify(singularizedName) %> | undefined;
 
-  constructor(facade: <%= classify(singularizedName) %>ListFacade,
-    public readonly crudFacade: <%= classify(singularizedName) %>CrudFacade,
-    router: Router) {
-    super(facade, <%= camelize(singularizedName) %>GridState, router);
+  constructor() {
+    super(inject(<%= classify(singularizedName) %>ListFacade), <%= camelize(singularizedName) %>GridState, inject(Router));
   }
 
   public addItem(): void {

package/schematics/imng-list/files/list.facade.ts.template

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { IDataDeleteFacade } from 'imng-kendo-data-entry';
 import { IKendoODataGridFacade } from 'imng-kendo-grid-odata';
@@ -8,13 +8,13 @@ import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(storeName) %>
 
 @Injectable()
 export class <%= classify(singularizedName) %>ListFacade implements IKendoODataGridFacade<I<%= classify(name) %>>, IDataDeleteFacade<I<%= classify(name) %>> {
+  private readonly store = inject(Store);
+
   loading$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectLoading);
   gridData$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectGridData);
   gridPagerSettings$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectGridPagerSettings);
   gridODataState$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectGridODataState);
 
-  constructor(private readonly store: Store) {}
-
   public loadEntities(state: ODataState): void {
     this.store.dispatch(<%= camelize(storeName) %>ActionTypes.load<%= classify(pluralizedName) %>Request(state));
   }

package/schematics/imng-module/files/+state/__singularizedName@dasherize__-crud.effects.ts.template

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { createEffect, Actions, ofType } from '@ngrx/effects';
 import { ODataService } from 'imng-kendo-odata';
 import { handleEffectError } from 'imng-ngrx-utils';
@@ -10,11 +10,10 @@ import { <%= classify(singularizedName) %>ApiService } from '../<%= dasherize(pl
 <% } %>
 @Injectable()
 export class <%= classify(singularizedName) %>CrudEffects {
-  constructor(
-    private readonly actions$: Actions,
-    private readonly odataService: ODataService,
-    private readonly <%= camelize(singularizedName) %>ApiService : <%= classify(singularizedName) %>ApiService,
-  ) {}
+    private readonly actions$ = inject(Actions);
+    private readonly odataService = inject(ODataService);
+    private readonly <%= camelize(singularizedName) %>ApiService = inject(<%= classify(singularizedName) %>ApiService);
+
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
   save<%= classify(singularizedName) %>Effect$ = createEffect(() => {
     return this.actions$.pipe(

package/schematics/imng-module/files/+state/__singularizedName@dasherize__-list.effects.ts.template

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { createEffect, Actions, ofType } from '@ngrx/effects';
 import { concatLatestFrom } from '@ngrx/operators';
@@ -12,11 +12,10 @@ import { environment } from '@env';
 
 @Injectable()
 export class <%= classify(singularizedName) %>ListEffects {
-  constructor(
-    private readonly actions$: Actions,
-    private readonly odataService: ODataService,
-    private readonly store: Store,
-  ) {}
+    private readonly actions$ = inject(Actions);
+    private readonly odataService = inject(ODataService);
+    private readonly store = inject(Store);
+
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
   load<%= classify(pluralizedName) %>Effect$ = createEffect(() => {
     return this.actions$.pipe(