imng-kendo-schematics 19.178.4 → 19.182.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imng-kendo-schematics",
-  "version": "19.178.4",
+  "version": "19.182.5",
   "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/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,8 +1,9 @@
 import { Injectable, inject } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { IDataEntryFacade } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
+import { IDataEntryFacade, ModalStates } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
 import { ODataState } from 'imng-kendo-odata';<% } %>
-import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(singularizedStoreName) %>Selectors, <%= camelize(singularizedStoreName) %>ActionTypes } from '../+state';
+import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(singularizedStoreName) %>ActionTypes } from '../+state';
+import { map } from 'rxjs';
 
 @Injectable()
 export class <%= classify(name) %>CrudFacade implements IDataEntryFacade<I<%= classify(name) %>> {
@@ -10,12 +11,22 @@ export class <%= classify(name) %>CrudFacade implements IDataEntryFacade<I<%= cl
 
   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){ %>
+  currentModalState$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectCurrentModalState);
+  isEditActive$ = this.currentModalState$.pipe(
+    map((modalState) => modalState === ModalStates.EDIT),
+  );
+  isNewActive$ = this.currentModalState$.pipe(
+    map((modalState) => modalState === ModalStates.ADD),
+  );<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
   <%= camelize(swaggerProperty.pluralizedName) %>$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.select<%= classify(swaggerProperty.pluralizedName) %>);<% }); %>
 
-  public setCurrentEntity(item: I<%= classify(name) %>): void {
-    this.store.dispatch(<%= camelize(singularizedStoreName) %>ActionTypes.setCurrent<%= classify(name) %>(item));
+  public setCurrentEntity(item: I<%= classify(name) %>, modalState: string): void {
+    this.store.dispatch(
+      <%= camelize(singularizedStoreName) %>ActionTypes.setCurrent<%= classify(name) %>({
+        modalState,
+        entity: item,
+      }),
+    );
   }
 
   public clearCurrentEntity(): void {

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.spec.ts.template

@@ -4,6 +4,7 @@ import { provideRouter } from '@angular/router';
 import { createDataEntryMockFacade, createDataDeleteMockFacade } from 'imng-kendo-data-entry/testing';
 import { createODataGridMockFacade } from 'imng-kendo-grid-odata/testing';
 import { provideOidcMockFacade } from 'imng-oidc-client/testing';
+import { ModalStates } from 'imng-kendo-data-entry';
 
 import { <%= classify(singularizedName) %>ListComponent } from './list.component';
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
@@ -60,14 +61,14 @@ describe('<%= classify(singularizedName) %>ListComponent', () => {
   test('it should handle AddItem', () => {
     component.addItem();
     expect(crudFacade.setCurrentEntity).toHaveBeenCalledTimes(1);
-    expect(crudFacade.setCurrentEntity).toHaveBeenCalledWith({});
+    expect(crudFacade.setCurrentEntity).toHaveBeenCalledWith({}, ModalStates.ADD);
   });
 
   test('it should handle EditItem', () => {
     const item = createTest<%= classify(singularizedName) %>();
     component.editItem(item);
     expect(crudFacade.setCurrentEntity).toHaveBeenCalledTimes(1);
-    expect(crudFacade.setCurrentEntity).toHaveBeenCalledWith(item);
+    expect(crudFacade.setCurrentEntity).toHaveBeenCalledWith(item, ModalStates.EDIT);
   });
 
   test('it should handle DeleteItem', () => {

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

@@ -2,6 +2,7 @@ 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';
+import { ModalStates } from 'imng-kendo-data-entry';
 
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
 import { <%= classify(singularizedName) %>CrudFacade } from '../<%= dasherize(pluralizedName) %>-crud';
@@ -16,7 +17,6 @@ import { <%= camelize(singularizedName) %>GridState } from './list.grid-state';
 })
 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;<% }) %>
@@ -27,11 +27,11 @@ export class <%= classify(singularizedName) %>ListComponent extends KendoODataBa
   }
 
   public addItem(): void {
-    this.crudFacade.setCurrentEntity({});
+    this.crudFacade.setCurrentEntity({}, ModalStates.ADD);
   }
 
   public editItem(item: I<%= classify(singularizedName) %>): void {
-    this.crudFacade.setCurrentEntity(item);
+    this.crudFacade.setCurrentEntity(item, ModalStates.EDIT);
   }
 
   public deleteItem(item: I<%= classify(singularizedName) %>): void {

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

@@ -1,6 +1,6 @@
 import { createAction } from '@ngrx/store';
 import { ODataResult, ODataState } from 'imng-kendo-odata';
-import { createPayloadAction } from 'imng-ngrx-utils';
+import { createModalAction, createPayloadAction } from 'imng-ngrx-utils';
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
 export const load<%= classify(pluralizedName) %>Request = createPayloadAction<ODataState>(
     '[<%= classify(pluralizedName) %>] Load <%= classify(pluralizedName) %> Request');
@@ -12,7 +12,7 @@ export const reload<%= classify(pluralizedName) %>Success = createPayloadAction<
     '[<%= classify(pluralizedName) %>] Reload <%= classify(pluralizedName) %> Success');
 
 export const clearCurrent<%= classify(name) %> = createAction('[<%= classify(pluralizedName) %>] Clear Current <%= classify(name) %>');
-export const setCurrent<%= classify(name) %> = createPayloadAction<I<%= classify(name) %>>('[<%= classify(pluralizedName) %>] Set Current <%= classify(name) %>');
+export const setCurrent<%= classify(name) %> = createModalAction<I<%= classify(name) %>>('[<%= classify(pluralizedName) %>] Set Current <%= classify(name) %>');
 export const save<%= classify(name) %>Request = createPayloadAction<I<%= classify(name) %>>('[<%= classify(pluralizedName) %>] Save <%= classify(name) %> Request');
 export const update<%= classify(name) %>Request = createPayloadAction<I<%= classify(name) %>>('[<%= classify(pluralizedName) %>] Update <%= classify(name) %> Request');
 export const delete<%= classify(name) %>Request = createPayloadAction<I<%= classify(name) %>>('[<%= classify(pluralizedName) %>] Delete <%= classify(name) %> Request');

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

@@ -7,12 +7,14 @@ export const <%= underscore(pluralizedName).toUpperCase() %>_FEATURE_KEY = '<%=
 
 export interface State extends KendoODataGridState<I<%= classify(singularizedName) %>> {
   current<%= classify(singularizedName) %>: I<%= classify(singularizedName) %> | undefined;<% if(openApiJsonUrl || openApiJsonFileName){ swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
+  currentModalState: string | undefined;
   <%= camelize(swaggerProperty.pluralizedName) %>: I<%= classify(swaggerProperty.propertyTypeName) %>[];<% })} %>
 }
 
 export const initialState: State = {
   ...createKendoODataGridInitialState(),
-  current<%= classify(singularizedName) %>: undefined,<% if(openApiJsonUrl || openApiJsonFileName){  swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
+  current<%= classify(singularizedName) %>: undefined,
+  currentModalState: undefined,<% if(openApiJsonUrl || openApiJsonFileName){  swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
   <%= camelize(swaggerProperty.pluralizedName) %>: [],<% })} %>
   loading: true,
 };
@@ -40,9 +42,15 @@ export const <%= camelize(pluralizedStoreName) %>Feature = createFeature({
         error: null, })),
     on(<%= camelize(singularizedName) %>ActionTypes.setCurrent<%= classify(singularizedName) %>,
       (state, { payload }) : State =>
-        ({ ...state, current<%= classify(singularizedName) %>: payload })),
+        ({ ...state,
+        currentModalState: payload.modalState,
+        current<%= classify(singularizedName) %>: payload.entity })),
     on(<%= camelize(singularizedName) %>ActionTypes.clearCurrent<%= classify(singularizedName) %>,
-      (state) : State => ({ ...state, current<%= classify(singularizedName) %>: undefined })),
+      (state) : State => ({
+        ...state, 
+        current<%= classify(singularizedName) %>: undefined,
+        currentModalState: undefined,
+      })),
     on(<%= camelize(singularizedName) %>ActionTypes.save<%= classify(singularizedName) %>Request,
       <%= camelize(singularizedName) %>ActionTypes.update<%= classify(singularizedName) %>Request,
       <%= camelize(singularizedName) %>ActionTypes.delete<%= classify(singularizedName) %>Request,

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

@@ -1,17 +0,0 @@
-import { createSelector } from '@ngrx/store';
-import { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedName) %>.feature';
-import { isTruthy } from 'imng-ngrx-utils';
-<% if (openApiJsonUrl || openApiJsonFileName) { %>
-const selectIsEdit<%= classify(name) %>Active = createSelector(
-  <%= camelize(pluralizedStoreName) %>Feature.selectCurrent<%= classify(name) %>,
-  (entity) => isTruthy(entity?.id));
-const selectIsNew<%= classify(name) %>Active = createSelector(
-  <%= camelize(pluralizedStoreName) %>Feature.selectCurrent<%= classify(name) %>,
-  (entity) => isTruthy(entity) && !isTruthy(entity?.id));
-export const <%= camelize(singularizedName) %>Selectors = {
-  selectIsEdit<%= classify(name) %>Active,
-  selectIsNew<%= classify(name) %>Active,
-};
-
-<% } else { %>
-export const <%= camelize(singularizedName) %>Selectors = {};<% } %>