imng-kendo-schematics 6.233.2 → 7.209.3

package/package.json

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

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

@@ -68,8 +68,8 @@ describe('<%= classify(name) %>AddComponent', () => {
     facade.updateExistingEntity = jest.fn();
     expect(component.getFormErrors()).toStrictEqual([]);
     component.onSubmit();
-    expect(facade.saveNewEntity).toBeCalledTimes(1);
-    expect(facade.updateExistingEntity).toBeCalledTimes(0);
+    expect(facade.saveNewEntity).toHaveBeenCalledTimes(1);
+    expect(facade.updateExistingEntity).toHaveBeenCalledTimes(0);
 <% if (hasDates) { %>
     expect(item).toMatchSnapshot({
 <% swaggerProperties.filter(t=> t.format === 'date-time' || t.format === 'date').forEach(function(swaggerProperty)
@@ -87,15 +87,15 @@ describe('<%= classify(name) %>AddComponent', () => {
     const consoleErrorMock = mockConsoleError();
     component.addEditForm?.patchValue({});
     component.onSubmit();
-    expect(facade.saveNewEntity).toBeCalledTimes(0);
-    expect(facade.updateExistingEntity).toBeCalledTimes(0);
+    expect(facade.saveNewEntity).toHaveBeenCalledTimes(0);
+    expect(facade.updateExistingEntity).toHaveBeenCalledTimes(0);
     consoleErrorMock.mockRestore();
   });
 
   test('should cancel', () => {
     facade.clearCurrentEntity = jest.fn();
     component.cancel();
-    expect(facade.clearCurrentEntity).toBeCalledTimes(1);
+    expect(facade.clearCurrentEntity).toHaveBeenCalledTimes(1);
   });<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
 
   test('should support <%= classify(swaggerProperty.name) %> filters', async () => {

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

@@ -80,7 +80,7 @@ describe('<%= classify(name) %>CrudFacade', () => {
 
     test('should load <%= classify(swaggerProperty.pluralizedName) %>', async () => {
       facade.load<%= classify(swaggerProperty.pluralizedName) %>({});
-      expect(httpClient.get).toBeCalledTimes(1);
+      expect(httpClient.get).toHaveBeenCalledTimes(1);
       const result = await readFirst(facade.<%= camelize(swaggerProperty.pluralizedName) %>$);
       expect(result.length).toBe(1);
     });<% }); %>

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

@@ -50,8 +50,8 @@ describe('<%= classify(name) %>EditComponent', () => {
     facade.updateExistingEntity = jest.fn(x => (item = x));
     expect(component.getFormErrors()).toStrictEqual([]);
     component.onSubmit();
-    expect(facade.saveNewEntity).toBeCalledTimes(0);
-    expect(facade.updateExistingEntity).toBeCalledTimes(1);
+    expect(facade.saveNewEntity).toHaveBeenCalledTimes(0);
+    expect(facade.updateExistingEntity).toHaveBeenCalledTimes(1);
 <% if (hasDates) { %>
     expect(item).toMatchSnapshot({
 <% swaggerProperties.filter(t=> t.format === 'date-time' || t.format === 'date').forEach(function(swaggerProperty)
@@ -70,14 +70,14 @@ describe('<%= classify(name) %>EditComponent', () => {
     const consoleErrorMock = mockConsoleError();
     component.addEditForm?.patchValue({});
     component.onSubmit();
-    expect(facade.saveNewEntity).toBeCalledTimes(0);
-    expect(facade.updateExistingEntity).toBeCalledTimes(0);
+    expect(facade.saveNewEntity).toHaveBeenCalledTimes(0);
+    expect(facade.updateExistingEntity).toHaveBeenCalledTimes(0);
     consoleErrorMock.mockRestore();
   });
 
   test('should cancel', () => {
     component.cancel();
-    expect(facade.clearCurrentEntity).toBeCalledTimes(1);
+    expect(facade.clearCurrentEntity).toHaveBeenCalledTimes(1);
   });<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
 
   test('should support <%= classify(swaggerProperty.name) %> filters', async () => {

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

@@ -1,12 +1,14 @@
 import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+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 { <%= classify(singularizedName) %>ListComponent } from './list.component';
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
 import { <%= classify(singularizedName) %>CrudFacade } from '../<%= dasherize(pluralizedName) %>-crud';
+import { <%= camelize(singularizedName) %>Routes } from '../<%= dasherize(pluralizedName) %>.routing';
 
 describe('<%= classify(singularizedName) %>ListComponent', () => {
   let component: <%= classify(singularizedName) %>ListComponent;
@@ -17,10 +19,12 @@ describe('<%= classify(singularizedName) %>ListComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [<%= classify(singularizedName) %>ListComponent],
-      imports: [RouterTestingModule],
+      imports: [],
       providers: [
         { provide: <%= classify(singularizedName) %>ListFacade, useValue: createODataGridMockFacade(createDataDeleteMockFacade()) },
         { provide: <%= classify(singularizedName) %>CrudFacade, useValue: createDataEntryMockFacade() },
+        provideRouter(<%= camelize(singularizedName) %>Routes),
+        provideOidcMockFacade(),
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -50,26 +54,26 @@ describe('<%= classify(singularizedName) %>ListComponent', () => {
 
   test('it should handle reload', () => {
     component.reloadEntities();
-    expect(listFacade.reloadEntities).toBeCalledTimes(1);
+    expect(listFacade.reloadEntities).toHaveBeenCalledTimes(1);
   });
 
   test('it should handle AddItem', () => {
     component.addItem();
-    expect(crudFacade.setCurrentEntity).toBeCalledTimes(1);
-    expect(crudFacade.setCurrentEntity).toBeCalledWith({});
+    expect(crudFacade.setCurrentEntity).toHaveBeenCalledTimes(1);
+    expect(crudFacade.setCurrentEntity).toHaveBeenCalledWith({});
   });
 
   test('it should handle EditItem', () => {
     const item = createTest<%= classify(singularizedName) %>();
     component.editItem(item);
-    expect(crudFacade.setCurrentEntity).toBeCalledTimes(1);
-    expect(crudFacade.setCurrentEntity).toBeCalledWith(item);
+    expect(crudFacade.setCurrentEntity).toHaveBeenCalledTimes(1);
+    expect(crudFacade.setCurrentEntity).toHaveBeenCalledWith(item);
   });
 
   test('it should handle DeleteItem', () => {
     const item = createTest<%= classify(singularizedName) %>();
     component.deleteItem(item);
-    expect(listFacade.deleteExistingEntity).toBeCalledTimes(1);
-    expect(listFacade.deleteExistingEntity).toBeCalledWith(item);
+    expect(listFacade.deleteExistingEntity).toHaveBeenCalledTimes(1);
+    expect(listFacade.deleteExistingEntity).toHaveBeenCalledWith(item);
   });
 });

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

@@ -63,11 +63,11 @@ describe('<%= classify(singularizedName) %>ListFacade', () => {
       const loading = await readFirst(facade.loading$);
       expect(list?.data.length).toBe(1);
       expect(loading).toBe(false);
-      expect(httpClient.get).toBeCalledTimes(1);
-      expect(httpClient.get).toBeCalledWith('<%= dasherize(pluralizedStoreName) %>-odata/odata/v1/<%= classify(pluralizedName) %>?&$count=true');
+      expect(httpClient.get).toHaveBeenCalledTimes(1);
+      expect(httpClient.get).toHaveBeenCalledWith('<%= dasherize(pluralizedStoreName) %>-odata/odata/v1/<%= classify(pluralizedName) %>?&$count=true');
 
       facade.reloadEntities();
-      expect(httpClient.get).toBeCalledTimes(2);
+      expect(httpClient.get).toHaveBeenCalledTimes(2);
     });
 
     test('reloadEntities() should return empty list with loaded == true', async () => {
@@ -87,7 +87,7 @@ describe('<%= classify(singularizedName) %>ListFacade', () => {
 
       expect(list?.data.length).toBe(3);
       expect(isloading).toBe(false);
-      expect(service.fetch).toBeCalledTimes(1);
+      expect(service.fetch).toHaveBeenCalledTimes(1);
     });
 
     test('it should get the grid state', async () => {

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

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { createEffect, Actions, ofType, concatLatestFrom } from '@ngrx/effects';
+import { createEffect, Actions, ofType } from '@ngrx/effects';
+import { concatLatestFrom } from '@ngrx/operators';
 import { ODataService } from 'imng-kendo-odata';
 import { handleEffectError } from 'imng-ngrx-utils';
 import { map, switchMap } from 'rxjs/operators';

package/schematics/imng-module/files/__pluralizedName@dasherize__.routing.ts.template

@@ -4,12 +4,12 @@ import { AuthGuard } from 'imng-oidc-client';<% if (openApiJsonUrl || openApiJso
 import { <%= classify(singularizedName) %>ListComponent } from './<%= dasherize(pluralizedName) %>-list';
 <% } %>
 
-const routes: Routes = [
+export const <%= camelize(singularizedName) %>Routes: Routes = [
   { path: '', component: <% if (openApiJsonUrl || openApiJsonFileName) { %><%= classify(singularizedName) %>ListComponent<% } %>, canActivate: [AuthGuard] }
 ];
 
 @NgModule({
-  imports: [RouterModule.forChild(routes)],
+  imports: [RouterModule.forChild(<%= camelize(singularizedName) %>Routes)],
   exports: [RouterModule]
 })
 export class <%= classify(pluralizedName) %>RoutingModule { }

package/schematics/imng-sub-list/files/__pluralizedName@dasherize__-list/list.component.spec.ts.template

@@ -1,12 +1,12 @@
 import { CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 import { createDataDeleteMockFacade } from 'imng-kendo-data-entry/testing';
 import { createODataGridMockFacade } from 'imng-kendo-grid-odata/testing';
 
 import { <%= classify(singularizedName) %>ListComponent } from './list.component';
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
 
+
 describe('<%= classify(singularizedName) %>ListComponent', () => {
   let component: <%= classify(singularizedName) %>ListComponent;
   let fixture: ComponentFixture<<%= classify(singularizedName) %>ListComponent>;
@@ -15,7 +15,7 @@ describe('<%= classify(singularizedName) %>ListComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [<%= classify(singularizedName) %>ListComponent],
-      imports: [RouterTestingModule],
+      imports: [],
       providers: [
         { provide: <%= classify(singularizedName) %>ListFacade, useValue: createODataGridMockFacade(createDataDeleteMockFacade()) },
       ],
@@ -41,13 +41,13 @@ describe('<%= classify(singularizedName) %>ListComponent', () => {
 
   test('it should handle reload', () => {
     component.reloadEntities();
-    expect(listFacade.reloadEntities).toBeCalledTimes(1);
+    expect(listFacade.reloadEntities).toHaveBeenCalledTimes(1);
   });
 
   test('it should handle DeleteItem', () => {
     const item = createTest<%= classify(singularizedName) %>();
     component.deleteItem(item);
-    expect(listFacade.deleteExistingEntity).toBeCalledTimes(1);
-    expect(listFacade.deleteExistingEntity).toBeCalledWith(item);
+    expect(listFacade.deleteExistingEntity).toHaveBeenCalledTimes(1);
+    expect(listFacade.deleteExistingEntity).toHaveBeenCalledWith(item);
   });
 });

package/schematics/imng-sub-list/files/__pluralizedName@dasherize__-list/list.facade.spec.ts.template

@@ -73,12 +73,12 @@ describe('<%= classify(singularizedName) %>ListFacade', () => {
       const gridPagerSettings$ = await readFirst(facade.gridPagerSettings$);
       expect(gridPagerSettings$).toBe(false);
 
-      expect(httpClient.get).toBeCalledTimes(1);
-      expect(httpClient.get).toBeCalledWith(
+      expect(httpClient.get).toHaveBeenCalledTimes(1);
+      expect(httpClient.get).toHaveBeenCalledWith(
         `<%= dasherize(pluralizedStoreName) %>-odata/odata/v1/<%= classify(pluralizedName) %>?$filter=<%= camelize(singularizedParentName) %>Id eq '<%= snakeCasedParentName %>_ID'&$count=true`);
 
       facade.reloadEntities();
-      expect(httpClient.get).toBeCalledTimes(2);
+      expect(httpClient.get).toHaveBeenCalledTimes(2);
     });
 
     test('reloadEntities() should return empty list with loaded == true', async () => {
@@ -101,7 +101,7 @@ describe('<%= classify(singularizedName) %>ListFacade', () => {
 
       expect(list?.data.length).toBe(3);
       expect(isloading).toBe(false);
-      expect(service.fetch).toBeCalledTimes(1);
+      expect(service.fetch).toHaveBeenCalledTimes(1);
     });
 
     test('it should get the grid state', async () => {