imng-kendo-schematics 19.232.3 → 19.232.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imng-kendo-schematics",
-  "version": "19.232.3",
+  "version": "19.232.4",
   "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

@@ -10,7 +10,6 @@ import { <%= classify(name) %>BaseEntryComponent } from './base-entry.component'
 })
 export class <%= classify(name) %>AddComponent extends <%= classify(name) %>BaseEntryComponent implements OnInit, OnDestroy {
   public dialogTitle = 'Add <%= classify(name) %>';
-  public active$ = this.facade.isNewActive$;
 
   public override initForm(): void {
     super.initForm();

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

@@ -5,8 +5,9 @@ import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, Store } from '@ngrx/store';
 import { readFirst } from 'imng-ngrx-utils/testing';
 import {
-  testAddSetAndClearCurrentEntity,
-  testEditSetAndClearCurrentEntity,
+  testDeleteCurrentEntity,
+  testModalStateAddAndClearCurrentEntity,
+  testModalStateEditAndClearCurrentEntity,
   testSaveCurrentEntity,
   testUpdateCurrentEntity,
 } from 'imng-kendo-data-entry/testing';
@@ -59,24 +60,27 @@ describe('<%= classify(name) %>CrudFacade', () => {
     });
 
     test('clearCurrentEntity() should set current<%= classify(name) %> to null', async () => {
-      let isNewActive = await readFirst(facade.isNewActive$);
-      expect(isNewActive).toBeFalsy();
+      let currentModalState = await readFirst(facade.currentModalState$);
+      expect(currentModalState).toBeUndefined();
 
       facade.clearCurrentEntity();
-      isNewActive = await readFirst(facade.isNewActive$);
+      currentModalState = await readFirst(facade.currentModalState$);
 
-      expect(isNewActive).toBeFalsy();
+      expect(currentModalState).toBeUndefined();
       expect(await readFirst(store)).toMatchSnapshot();
     });
 
-    test('New Entity Set And Clear CurrentEntity', async () =>
-      testAddSetAndClearCurrentEntity<<%= classify(name) %>CrudFacade>(facade));
-    test('Existing Entity Set And Clear CurrentEntity', async () =>
-      testEditSetAndClearCurrentEntity<<%= classify(name) %>CrudFacade>(facade));
+    test('Add Modal State And Clear CurrentEntity', async () =>
+      testModalStateAddAndClearCurrentEntity<<%= classify(name) %>CrudFacade>(facade));
+    test('Edit Modal state And Clear CurrentEntity', async () =>
+      testModalStateEditAndClearCurrentEntity<<%= classify(name) %>CrudFacade>(facade));
     test('Save CurrentEntity', async () =>
       testSaveCurrentEntity<<%= classify(name) %>CrudFacade>(facade, httpClient));
     test('Update CurrentEntity', async () =>
-      testUpdateCurrentEntity<<%= classify(name) %>CrudFacade>(facade, httpClient));<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
+      testUpdateCurrentEntity<<%= classify(name) %>CrudFacade>(facade, httpClient));
+    test('it should handle DeleteItem', async () => {
+      await testDeleteCurrentEntity(facade, httpClient);
+    });<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
 
     test('should load <%= classify(swaggerProperty.pluralizedName) %>', async () => {
       facade.load<%= classify(swaggerProperty.pluralizedName) %>({});

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

@@ -1,20 +1,18 @@
 import { Injectable, inject } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { IDataEntryFacade, ModalStates, isModalState } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
+import { IDataDeleteFacade, IDataEntryFacade } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
 import { ODataState } from 'imng-kendo-odata';<% } %>
 
 import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(singularizedStoreName) %>ActionTypes } from '../+state';<% if (modelFolderLocation) { %>
 import { I<%= classify(singularizedName) %>, <% swaggerObjectProperties.forEach(function(swaggerProperty, i, arr){ %>I<%= classify(swaggerProperty.name) %><% if(arr.length != i + 1) {%>, <%} }); %> } from '<%= modelFolderLocation %>';<% } %>
 
 @Injectable()
-export class <%= classify(name) %>CrudFacade implements IDataEntryFacade<I<%= classify(name) %>> {
+export class <%= classify(name) %>CrudFacade implements IDataEntryFacade<I<%= classify(name) %>>, IDataDeleteFacade<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) %>);
-  currentModalState$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectCurrent<%= classify(singularizedName) %>ModalState);
-  isEditActive$ = isModalState(this, ModalStates.EDIT);
-  isNewActive$ = isModalState(this, ModalStates.ADD);<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
+  currentModalState$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectCurrent<%= classify(singularizedName) %>ModalState);<% 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) %>, modalState: string): void {
@@ -37,6 +35,10 @@ export class <%= classify(name) %>CrudFacade implements IDataEntryFacade<I<%= cl
   public updateExistingEntity(item: I<%= classify(name) %>): void {
     this.store.dispatch(<%= camelize(singularizedStoreName) %>ActionTypes.update<%= classify(name) %>Request(item));
   }
+
+  public deleteExistingEntity(item: I<%= classify(name) %>): void {
+    this.store.dispatch(<%= camelize(singularizedStoreName) %>ActionTypes.delete<%= classify(name) %>Request(item));
+  }
 <% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
   public load<%= classify(swaggerProperty.pluralizedName) %>(state: ODataState): void {
     this.store.dispatch(<%= camelize(singularizedStoreName) %>ActionTypes.load<%= classify(swaggerProperty.pluralizedName) %>Request(state));

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

@@ -12,13 +12,10 @@ import { <%= classify(name) %>BaseEntryComponent } from './base-entry.component'
 })
 export class <%= classify(name) %>EditComponent extends <%= classify(name) %>BaseEntryComponent implements OnInit, OnDestroy {
   public dialogTitle = 'Edit <%= classify(name) %>';
-  public active$ = this.facade.isEditActive$;
 
   public override initForm(): void {
     super.initForm();
-    if (this.addEditForm) {
-      this.allSubscriptions.push(this.facade.currentEntity$.pipe(formGroupPatcher(this.addEditForm)).subscribe());
-    }
+    this.allSubscriptions.push(this.facade.currentEntity$.pipe(formGroupPatcher(this.addEditForm)).subscribe());
   }
 
   public save(): void {

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

@@ -101,9 +101,19 @@
   </kendo-grid-pdf>
   <kendo-grid-excel [fileName]="getExportFileName('<%= classify(pluralizedName) %>')" [fetchData]="excelData" />
 </kendo-grid>
-@if (crudFacade.isNewActive$ | async) {
-  <<%= appPrefix %>-<%= dasherize(name) %>-add />
-}
-@if (crudFacade.isEditActive$ | async) {
-  <<%= appPrefix %>-<%= dasherize(name) %>-edit />
-}
+
+@switch (crudFacade.currentModalState$ | async) {
+  @case (modalStates.ADD) {
+    <<%= appPrefix %>-<%= dasherize(name) %>-add />
+  }
+  @case (modalStates.EDIT) {
+    <<%= appPrefix %>-<%= dasherize(name) %>-edit />
+  }
+  @case (modalStates.DELETE) {
+    <imng-data-delete-dialog
+      [facade]="crudFacade"
+      [dataItem]="crudFacade.currentEntity$ | async">
+      <div>Are you sure you want to delete this record?</div>
+    </imng-data-delete-dialog>
+  }
+}

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

@@ -1,7 +1,7 @@
 import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { provideRouter } from '@angular/router';
-import { createDataEntryMockFacade, createDataDeleteMockFacade } from 'imng-kendo-data-entry/testing';
+import { createDataEntryMockFacade } 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';
@@ -23,7 +23,7 @@ describe('<%= classify(singularizedName) %>ListComponent', () => {
       declarations: [<%= classify(singularizedName) %>ListComponent],
       imports: [],
       providers: [
-        { provide: <%= classify(singularizedName) %>ListFacade, useValue: createODataGridMockFacade(createDataDeleteMockFacade()) },
+        { provide: <%= classify(singularizedName) %>ListFacade, useValue: createODataGridMockFacade()) },
         { provide: <%= classify(singularizedName) %>CrudFacade, useValue: createDataEntryMockFacade() },
         provideRouter(<%= camelize(singularizedName) %>Routes),
         provideOidcMockFacade(),
@@ -75,7 +75,10 @@ describe('<%= classify(singularizedName) %>ListComponent', () => {
   test('it should handle DeleteItem', () => {
     const item = createTest<%= classify(singularizedName) %>();
     component.deleteItem(item);
-    expect(listFacade.deleteExistingEntity).toHaveBeenCalledTimes(1);
-    expect(listFacade.deleteExistingEntity).toHaveBeenCalledWith(item);
+    expect(crudFacade.setCurrentEntity).toHaveBeenCalledTimes(1);
+    expect(crudFacade.setCurrentEntity).toHaveBeenCalledWith(
+      item,
+      ModalStates.DELETE,
+    );
   });
 });

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

@@ -22,6 +22,7 @@ export class <%= classify(singularizedName) %>ListComponent extends KendoODataBa
   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;
+  public readonly modalStates = ModalStates;
 
   constructor() {
     super(inject(<%= classify(singularizedName) %>ListFacade), <%= camelize(singularizedName) %>GridState, inject(Router));
@@ -36,7 +37,7 @@ export class <%= classify(singularizedName) %>ListComponent extends KendoODataBa
   }
 
   public deleteItem(item: I<%= classify(singularizedName) %>): void {
-    this.facade.deleteExistingEntity(item);
+    this.crudFacade.setCurrentEntity(item, ModalStates.DELETE);
   }
 
   public detailExpanded(evt: DetailExpandEvent): void {

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

@@ -5,7 +5,6 @@ import { readFirst } from 'imng-ngrx-utils/testing';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule, Store } from '@ngrx/store';
 import { ODataState, createODataPayload, createODataResult, ODataService } from 'imng-kendo-odata';
-import { testDeleteCurrentEntity } from 'imng-kendo-data-entry/testing';
 import { Observable, of } from 'rxjs';
 
 import { <%= camelize(pluralizedStoreName) %>Feature, <%= classify(singularizedStoreName) %>ListEffects, <%= classify(singularizedStoreName) %>CrudEffects } from '../+state';
@@ -117,9 +116,5 @@ describe('<%= classify(singularizedName) %>ListFacade', () => {
       list = await readFirst(facade.gridData$);
       expect(list?.data.length).toBe(2);
     });
-
-    test('it should handle DeleteItem', async () => {
-      await testDeleteCurrentEntity(facade, httpClient);
-    });
   });
 });

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

@@ -1,6 +1,5 @@
 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';
 import { ODataState } from 'imng-kendo-odata';
 
@@ -8,7 +7,7 @@ import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(storeName) %>
 import { I<%= classify(name) %> } from '<%= modelFolderLocation %>';<% } %>
 
 @Injectable()
-export class <%= classify(singularizedName) %>ListFacade implements IKendoODataGridFacade<I<%= classify(name) %>>, IDataDeleteFacade<I<%= classify(name) %>> {
+export class <%= classify(singularizedName) %>ListFacade implements IKendoODataGridFacade<I<%= classify(name) %>> {
   private readonly store = inject(Store);
 
   loading$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.selectLoading);
@@ -23,8 +22,4 @@ export class <%= classify(singularizedName) %>ListFacade implements IKendoODataG
   public reloadEntities(): void {
     this.store.dispatch(<%= camelize(storeName) %>ActionTypes.reload<%= classify(pluralizedName) %>Request());
   }
-
-  public deleteExistingEntity(entity: I<%= classify(name) %>): void {
-    this.store.dispatch(<%= camelize(storeName) %>ActionTypes.delete<%= classify(name) %>Request(entity));
-  }
 }