imng-kendo-schematics 19.218.1 → 19.232.3

package/package.json

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

@@ -9,7 +9,8 @@ import { mockConsoleError<% if (hasDates || hasObjects) { %>, mockConsoleGroup,
 import { of } from 'rxjs';<% } %>
 
 import { <%= classify(name) %>AddComponent } from './add.component';
-import { <%= classify(name) %>CrudFacade } from './crud.facade';
+import { <%= classify(name) %>CrudFacade } from './crud.facade';<% if (modelFolderLocation) { %>
+import { I<%= classify(singularizedName) %>, createTest<%= classify(singularizedName) %> } from '<%= modelFolderLocation %>';<% } %>
 
 <% if (hasObjects) { %>export function createMock<%= classify(name) %>Facade() {
   return {

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

@@ -1,6 +1,8 @@
 import { Injectable } from '@angular/core';
 import { NrsrxBaseApiClientService } from 'imng-nrsrx-client-utils';
 import { environment } from '@env';
+<% if (modelFolderLocation) { %>
+import { I<%= classify(name) %>, <%= classify(name) %>Properties } from '<%= modelFolderLocation %>';<% } %>
 
 @Injectable({
   providedIn: 'root',

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

@@ -4,11 +4,12 @@ import { FormGroup } from '@angular/forms';
 import { BaseDataEntryComponent } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
 import { BehaviorSubject, map, Observable, switchMap } from 'rxjs';<% } %>
 
-import { <%= classify(name) %>CrudFacade } from './crud.facade';
+import { <%= classify(name) %>CrudFacade } from './crud.facade';<% if (modelFolderLocation) { %>
+import { <%= classify(singularizedName) %>Properties, I<%= classify(singularizedName) %>Form, <%= classify(singularizedName) %>FormGroupFac, <% swaggerObjectProperties.forEach(function(swaggerProperty, i, arr){ %>I<%= classify(swaggerProperty.propertyTypeName) %><% if(arr.length != i + 1) {%>, <%} }); %> } from '<%= modelFolderLocation %>';<% } %>
 
-@Component({ 
+@Component({
   template: '',
-  standalone: false, 
+  standalone: false,
 })
 export abstract class <%= classify(name) %>BaseEntryComponent extends BaseDataEntryComponent<<%= classify(name) %>CrudFacade>
   implements OnInit {

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

@@ -15,7 +15,8 @@ import { of } from 'rxjs';
 
 import { <%= camelize(pluralizedStoreName) %>Feature, <%= classify(singularizedStoreName) %>ListEffects, <%= classify(singularizedStoreName) %>CrudEffects } from '../+state';
 import { <%= classify(name) %>CrudFacade } from './crud.facade';
-import { <%= classify(name) %>ApiService } from './api.service';
+import { <%= classify(name) %>ApiService } from './api.service';<% if (modelFolderLocation) { %>
+import { createTest<%= classify(singularizedName) %> } from '<%= modelFolderLocation %>';<% } %>
 import { environment } from '@env';
 
 describe('<%= classify(name) %>CrudFacade', () => {

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

@@ -1,9 +1,10 @@
 import { Injectable, inject } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { IDataEntryFacade, ModalStates } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
+import { IDataEntryFacade, ModalStates, isModalState } from 'imng-kendo-data-entry';<% if (hasObjects) { %>
 import { ODataState } from 'imng-kendo-odata';<% } %>
-import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(singularizedStoreName) %>ActionTypes } from '../+state';
-import { map } from 'rxjs';
+
+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) %>> {
@@ -11,13 +12,9 @@ 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) %>);
-  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){ %>
+  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){ %>
   <%= camelize(swaggerProperty.pluralizedName) %>$ = this.store.select(<%= camelize(pluralizedStoreName) %>Feature.select<%= classify(swaggerProperty.pluralizedName) %>);<% }); %>
 
   public setCurrentEntity(item: I<%= classify(name) %>, modalState: string): void {

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

@@ -9,7 +9,8 @@ import { of } from 'rxjs';<% } %>
 import { mockConsoleError<% if (hasDates || hasObjects) { %>, mockConsoleGroup, mockConsoleWarn<% } %>, readFirst } from 'imng-ngrx-utils/testing';
 <% if (hasObjects) { %>import { createMock<%= classify(name) %>Facade } from './add.component.spec';<% } %>
 import { <%= classify(name) %>EditComponent } from './edit.component';
-import { <%= classify(name) %>CrudFacade } from './crud.facade';
+import { <%= classify(name) %>CrudFacade } from './crud.facade';<% if (modelFolderLocation) { %>
+import { I<%= classify(singularizedName) %>, createTest<%= classify(singularizedName) %> } from '<%= modelFolderLocation %>';<% } %>
 
 describe('<%= classify(name) %>EditComponent', () => {
   let component: <%= classify(name) %>EditComponent;

package/schematics/imng-crud/schema.json

@@ -1,38 +1,41 @@
 {
-    "$schema": "http://json-schema.org/schema",
-    "$id": "imng-crud",
-    "type": "object",
-    "properties": {
-      "name": {
-        "type": "string",
-        "description": "Entity name",
-        "$default": {
-          "$source": "argv",
-          "index": 0
-        }
-      },
-      "storeName": {
-        "type": "string",
-        "description": "NGRX Feature Store name"
-      },
-      "path": {
-        "type": "string",
-        "description": "Directory where you would like the output to go"
-      },
-      "openApiJsonUrl": {
-        "type": "string",
-        "description": "URL of swagger page"
-      },
-      "openApiJsonFileName": {
-        "type": "string",
-        "description": "Relative file name and path"
-      },
-      "appPrefix": {
-        "type": "string",
-        "default": "imng",
-        "description": "Application selector prefix for components and directives."
+  "$schema": "http://json-schema.org/schema",
+  "$id": "imng-crud",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Entity name",
+      "$default": {
+        "$source": "argv",
+        "index": 0
       }
     },
-    "required": ["name", "path"]
-  }
-  
+    "storeName": {
+      "type": "string",
+      "description": "NGRX Feature Store name"
+    },
+    "path": {
+      "type": "string",
+      "description": "Directory where you would like the output to go"
+    },
+    "openApiJsonUrl": {
+      "type": "string",
+      "description": "URL of OpenApi Json document"
+    },
+    "openApiJsonFileName": {
+      "type": "string",
+      "description": "Relative file name and path of OpenApi json document"
+    },
+    "appPrefix": {
+      "type": "string",
+      "default": "imng",
+      "description": "Application selector prefix for components and directives."
+    },
+    "modelFolderLocation": {
+      "type": "string",
+      "description": "Location of the model folder (relative to the generated component root)"
+    }
+  },
+  "required": ["name", "path"]
+}

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

@@ -13,7 +13,7 @@
   <kendo-grid-column [width]="75">
     <ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
       <kendo-menu title="Actions">
-        <kendo-menu-item [svgIcon]="icons.menuIcon">
+        <kendo-menu-item [svgIcon]="icons.menu">
           <kendo-menu-item>
             <ng-template kendoMenuItemLinkTemplate>
               <button
@@ -22,7 +22,7 @@
                 (click)="editItem(dataItem)"
                 placement="left"
                 tooltip="Edit">
-                <span class="k-icon k-i-edit"></span>
+                <kendo-svgicon [icon]="icons.menu" size="xlarge"></kendo-svgicon>
                 Edit
               </button>
             </ng-template>
@@ -35,7 +35,7 @@
                 (click)="deleteItem(dataItem)"
                 placement="left"
                 tooltip="Delete">
-                <span class="k-icon k-i-delete"></span>
+                <kendo-svgicon [icon]="icons.trash" size="xlarge"></kendo-svgicon>
                 Delete
               </button>
             </ng-template>
@@ -51,11 +51,11 @@
 <%} else if (swaggerProperty.type === 'boolean') { %>
   <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">
     <ng-template kendoGridCellTemplate let-dataItem>
-      <div *ngIf="dataItem[props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>]">
-        <span class="text-success font-weight-bolder h2" tooltip="<%= swaggerProperty.startCaseName %>">
-          <span class="k-icon k-i-check-circle start-50" />
-        </span>
-      </div>
+     @if (dataItem[props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>]) {
+        <kendo-svgicon class="text-success font-weight-bolder h2" [icon]="icons.check" size="xlarge"></kendo-svgicon>
+      } @else {
+        <kendo-svgicon class="text-danger font-weight-bolder h2" [icon]="icons.cancel" size="xlarge"></kendo-svgicon>
+      }
     </ng-template>
 <%} else if (swaggerProperty.format === 'uuid') { %>
   <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">

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

@@ -9,7 +9,8 @@ import { ModalStates } from 'imng-kendo-data-entry';
 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';
+import { <%= camelize(singularizedName) %>Routes } from '../<%= dasherize(pluralizedName) %>.routing';<% if (modelFolderLocation) { %>
+import { createTest<%= classify(name) %> } from '<%= modelFolderLocation %>';<% } %>
 
 describe('<%= classify(singularizedName) %>ListComponent', () => {
   let component: <%= classify(singularizedName) %>ListComponent;

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

@@ -6,7 +6,8 @@ import { ModalStates } from 'imng-kendo-data-entry';
 
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
 import { <%= classify(singularizedName) %>CrudFacade } from '../<%= dasherize(pluralizedName) %>-crud';
-import { <%= camelize(singularizedName) %>GridState } from './list.grid-state';
+import { <%= camelize(singularizedName) %>GridState } from './list.grid-state';<% if (modelFolderLocation) { %>
+import { I<%= classify(singularizedName) %>, <%= classify(singularizedName) %>Properties } from '<%= modelFolderLocation %>';<% } %>
 
 @Component({
   selector: '<%= appPrefix %>-<%= dasherize(singularizedName) %>-list',

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

@@ -9,7 +9,9 @@ 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';
-import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
+import * as <%= camelize(singularizedName) %>ActionTypes from '../+state/<%= dasherize(singularizedName) %>.actions';
+import { <%= classify(singularizedName) %>ListFacade } from './list.facade';<% if (modelFolderLocation) { %>
+import { createTest<%= classify(singularizedName) %> } from '<%= modelFolderLocation %>';<% } %>
 import { environment } from '@env';
 
 describe('<%= classify(singularizedName) %>ListFacade', () => {

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

@@ -4,7 +4,8 @@ import { IDataDeleteFacade } from 'imng-kendo-data-entry';
 import { IKendoODataGridFacade } from 'imng-kendo-grid-odata';
 import { ODataState } from 'imng-kendo-odata';
 
-import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(storeName) %>ActionTypes } from '../+state';
+import { <%= camelize(pluralizedStoreName) %>Feature, <%= camelize(storeName) %>ActionTypes } from '../+state';<% if (modelFolderLocation) { %>
+import { I<%= classify(name) %> } from '<%= modelFolderLocation %>';<% } %>
 
 @Injectable()
 export class <%= classify(singularizedName) %>ListFacade implements IKendoODataGridFacade<I<%= classify(name) %>>, IDataDeleteFacade<I<%= classify(name) %>> {

package/schematics/imng-list/files/list.grid-state.ts.template

@@ -1,4 +1,5 @@
-import { ODataState } from 'imng-kendo-odata';
+import { ODataState } from 'imng-kendo-odata';<% if (modelFolderLocation) { %>
+import { <%= classify(singularizedName) %>Properties, <% swaggerObjectProperties.forEach(function(swaggerProperty, i, arr){ %><%= classify(swaggerProperty.propertyTypeName) %>Properties<% if(arr.length != i + 1) {%>, <%} }); %> } from '<%= modelFolderLocation %>';<% } %>
 
 export const <%= camelize(singularizedName) %>GridState: ODataState = {
   take: 20,

package/schematics/imng-list/schema.json

@@ -1,38 +1,41 @@
 {
-    "$schema": "http://json-schema.org/schema",
-    "$id": "imng-list",
-    "type": "object",
-    "properties": {
-      "name": {
-        "type": "string",
-        "description": "Entity name",
-        "$default": {
-          "$source": "argv",
-          "index": 0
-        }
-      },
-      "storeName": {
-        "type": "string",
-        "description": "NGRX Feature Store name"
-      },
-      "path": {
-        "type": "string",
-        "description": "Directory where you would like the output to go"
-      },
-      "openApiJsonUrl": {
-        "type": "string",
-        "description": "URL of swagger page"
-      },
-      "openApiJsonFileName": {
-        "type": "string",
-        "description": "Relative file name and path"
-      },
-      "appPrefix": {
-        "type": "string",
-        "default": "imng",
-        "description": "Application selector prefix for components and directives."
+  "$schema": "http://json-schema.org/schema",
+  "$id": "imng-list",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Entity name",
+      "$default": {
+        "$source": "argv",
+        "index": 0
       }
     },
-    "required": ["name", "path"]
-  }
-  
+    "storeName": {
+      "type": "string",
+      "description": "NGRX Feature Store name"
+    },
+    "path": {
+      "type": "string",
+      "description": "Directory where you would like the output to go"
+    },
+    "openApiJsonUrl": {
+      "type": "string",
+      "description": "URL of OpenApi json document"
+    },
+    "openApiJsonFileName": {
+      "type": "string",
+      "description": "Relative file name and path of OpenApi json document"
+    },
+    "appPrefix": {
+      "type": "string",
+      "default": "imng",
+      "description": "Application selector prefix for components and directives."
+    },
+    "modelFolderLocation": {
+      "type": "string",
+      "description": "Location of the model folder (relative to the generated component root)"
+    }
+  },
+  "required": ["name", "path"]
+}

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

@@ -5,9 +5,9 @@ import { handleEffectError } from 'imng-ngrx-utils';
 import { map, switchMap } from 'rxjs/operators';
 
 import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
-<% if (openApiJsonUrl || openApiJsonFileName) { %>
-import { <%= classify(singularizedName) %>ApiService } from '../<%= dasherize(pluralizedName) %>-crud/api.service';
-<% } %>
+<% if (openApiJsonUrl || openApiJsonFileName) { %>import { <%= classify(singularizedName) %>ApiService } from '../<%= dasherize(pluralizedName) %>-crud/api.service';
+<% } %><% if (modelFolderLocation) { %>import { <% swaggerObjectProperties.forEach(function(swaggerProperty, i, arr){ %>I<%= classify(swaggerProperty.propertyTypeName) %><% if(arr.length != i + 1) {%>, <%} }); %> } from '<%= modelFolderLocation %>';<% } %>
+
 @Injectable()
 export class <%= classify(singularizedName) %>CrudEffects {
     private readonly actions$ = inject(Actions);

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

@@ -7,7 +7,8 @@ import { handleEffectError } from 'imng-ngrx-utils';
 import { map, switchMap } from 'rxjs/operators';
 
 import { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedName) %>.feature';
-import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
+import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';<% if (modelFolderLocation) { %>
+import { I<%= classify(name) %>, <%= classify(name) %>Properties } from '<%= modelFolderLocation %>';<% } %>
 import { environment } from '@env';
 
 @Injectable()

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

@@ -1,6 +1,7 @@
 import { createAction } from '@ngrx/store';
 import { ODataResult, ODataState } from 'imng-kendo-odata';
-import { createModalAction, createPayloadAction } from 'imng-ngrx-utils';
+import { createModalAction, createPayloadAction } from 'imng-ngrx-utils';<% if (modelFolderLocation) { %>
+import { I<%= classify(name) %>, <% swaggerObjectProperties.forEach(function(swaggerProperty, i, arr){ %>I<%= classify(swaggerProperty.propertyTypeName) %><% if(arr.length != i + 1) {%>, <%} }); %> } from '<%= modelFolderLocation %>';<% } %>
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
 export const load<%= classify(pluralizedName) %>Request = createPayloadAction<ODataState>(
     '[<%= classify(pluralizedName) %>] Load <%= classify(pluralizedName) %> Request');

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

@@ -2,19 +2,21 @@ import { createReducer, on, createFeature } from '@ngrx/store';
 import { createKendoODataGridInitialState, getODataPagerSettings, KendoODataGridState } from 'imng-kendo-grid-odata';
 import { imngEffectError, imngEffectErrorReducer } from 'imng-ngrx-utils';
 
-import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
+import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';<% if (modelFolderLocation) { %>
+import { I<%= classify(name) %>, <% swaggerObjectProperties.forEach(function(swaggerProperty, i, arr){ %>I<%= classify(swaggerProperty.propertyTypeName) %><% if(arr.length != i + 1) {%>, <%} }); %> } from '<%= modelFolderLocation %>';<% } %>
+
 export const <%= underscore(pluralizedName).toUpperCase() %>_FEATURE_KEY = '<%= camelize(pluralizedName) %>';
 
 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;
+  current<%= classify(singularizedName) %>: I<%= classify(singularizedName) %> | undefined;
+  current<%= classify(singularizedName) %>ModalState: string | undefined;<% if(openApiJsonUrl || openApiJsonFileName){ swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
   <%= camelize(swaggerProperty.pluralizedName) %>: I<%= classify(swaggerProperty.propertyTypeName) %>[];<% })} %>
 }
 
 export const initialState: State = {
   ...createKendoODataGridInitialState(),
   current<%= classify(singularizedName) %>: undefined,
-  currentModalState: undefined,<% if(openApiJsonUrl || openApiJsonFileName){  swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
+  current<%= classify(singularizedName) %>ModalState: undefined,<% if(openApiJsonUrl || openApiJsonFileName){  swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
   <%= camelize(swaggerProperty.pluralizedName) %>: [],<% })} %>
   loading: true,
 };
@@ -43,13 +45,13 @@ export const <%= camelize(pluralizedStoreName) %>Feature = createFeature({
     on(<%= camelize(singularizedName) %>ActionTypes.setCurrent<%= classify(singularizedName) %>,
       (state, { payload }) : State =>
         ({ ...state,
-        currentModalState: payload.modalState,
+        current<%= classify(singularizedName) %>ModalState: payload.modalState,
         current<%= classify(singularizedName) %>: payload.entity })),
     on(<%= camelize(singularizedName) %>ActionTypes.clearCurrent<%= classify(singularizedName) %>,
       (state) : State => ({
         ...state, 
         current<%= classify(singularizedName) %>: undefined,
-        currentModalState: undefined,
+        current<%= classify(singularizedName) %>ModalState: undefined,
       })),
     on(<%= camelize(singularizedName) %>ActionTypes.save<%= classify(singularizedName) %>Request,
       <%= camelize(singularizedName) %>ActionTypes.update<%= classify(singularizedName) %>Request,

package/schematics/imng-module/files/+state/index.ts.template

@@ -1,5 +1,4 @@
 export * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
 export { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedName) %>.feature';
 export { <%= classify(singularizedName) %>ListEffects } from './<%= dasherize(singularizedName) %>-list.effects';
-export { <%= classify(singularizedName) %>CrudEffects } from './<%= dasherize(singularizedName) %>-crud.effects';
-export { <%= camelize(singularizedName) %>Selectors } from './<%= dasherize(singularizedName) %>.selectors'
+export { <%= classify(singularizedName) %>CrudEffects } from './<%= dasherize(singularizedName) %>-crud.effects';

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

@@ -4,10 +4,11 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { StoreModule } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { GridModule, ExcelModule, PDFModule } from '@progress/kendo-angular-grid';
+import { IconsModule } from '@progress/kendo-angular-icons';
 import { DialogModule } from '@progress/kendo-angular-dialog';<% if (hasDates) { %>
 import { DateInputsModule } from '@progress/kendo-angular-dateinputs';<% } %><% if (hasObjects) { %>
 import { DropDownsModule } from '@progress/kendo-angular-dropdowns';<% } %>
-import { MenusModule } from "@progress/kendo-angular-menu";
+import { MenusModule } from '@progress/kendo-angular-menu';
 import { ImngKendoGridModule } from 'imng-kendo-grid';
 import { ImngKendoGridODataModule } from 'imng-kendo-grid-odata';
 import { ImngDataEntryDialogModule } from 'imng-kendo-data-entry';
@@ -27,6 +28,7 @@ import { <%= classify(singularizedName) %>AddComponent, <%= classify(singularize
     GridModule,
     ExcelModule,
     PDFModule,
+    IconsModule,
     DialogModule,<% if (hasDates) { %>
     DateInputsModule,<% } %><% if (hasObjects) { %>
     DropDownsModule,<% } %>

package/schematics/imng-module/schema.json

@@ -1,37 +1,41 @@
 {
-    "$schema": "http://json-schema.org/schema",
-    "$id": "imng-module",
-    "type": "object",
-    "properties": {
-      "name": {
-        "type": "string",
-        "description": "Module name (should be singular)",
-        "$default": {
-          "$source": "argv",
-          "index": 0
-        }
-      },
-      "path": {
-        "type": "string",
-        "description": "Directory where you would like the output to go"
-      },
-      "openApiJsonUrl": {
-        "type": "string",
-        "description": "URL of swagger page"
-      },
-      "openApiJsonFileName": {
-        "type": "string",
-        "description": "Relative file name and path"
-      },
-      "storeName": {
-        "type": "string",
-        "description": "NGRX Feature Store name"
-      },
-      "appPrefix": {
-        "type": "string",
-        "default": "imng",
-        "description": "Application selector prefix for components and directives."
+  "$schema": "http://json-schema.org/schema",
+  "$id": "imng-module",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Module name (should be singular)",
+      "$default": {
+        "$source": "argv",
+        "index": 0
       }
     },
-    "required": ["name", "path"]
-  }
+    "path": {
+      "type": "string",
+      "description": "Directory where you would like the output to go"
+    },
+    "openApiJsonUrl": {
+      "type": "string",
+      "description": "URL of OpenApi json document"
+    },
+    "openApiJsonFileName": {
+      "type": "string",
+      "description": "Relative file name and path of OpenApi json document"
+    },
+    "storeName": {
+      "type": "string",
+      "description": "NGRX Feature Store name"
+    },
+    "appPrefix": {
+      "type": "string",
+      "default": "imng",
+      "description": "Application selector prefix for components and directives."
+    },
+    "modelFolderLocation": {
+      "type": "string",
+      "description": "Location of the model folder (relative to the generated module root)"
+    }
+  },
+  "required": ["name", "path"]
+}

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

@@ -1,5 +1,7 @@
 import { ODataResult, ODataState } from 'imng-kendo-odata';
-import { createPayloadAction } from 'imng-ngrx-utils';
+import { createPayloadAction } from 'imng-ngrx-utils';<% if (modelFolderLocation) { %>
+import { I<%= classify(name) %> } from '<%= modelFolderLocation %>';<% } %>
+
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
 export const load<%= classify(pluralizedName) %>Request = createPayloadAction<{ <%= camelize(parentName) %>Id: string, odataState: ODataState; }>(
     '[<%= classify(pluralizedName) %>] Load <%= classify(pluralizedName) %> Request');

package/schematics/imng-sub-list/files/+state/__singularizedName@dasherize__.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, concatLatestFrom } from '@ngrx/effects';
 import { ODataService } from 'imng-kendo-odata';
@@ -13,12 +13,12 @@ import { environment } from '@env';
 
 @Injectable()
 export class <%= classify(singularizedName) %>Effects {
-  constructor(
-    private readonly actions$: Actions,
-    private readonly odataService: ODataService,
-    private readonly store: Store,
-    private readonly apiService : <%= classify(singularizedName) %>ApiService,
-  ) {}
+
+  private readonly actions$ = inject(Actions);
+  private readonly odataService = inject(ODataService);
+  private readonly store = inject(Store);
+  private readonly apiService = inject(<%= classify(singularizedName) %>ApiService);
+
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
   load<%= classify(pluralizedName) %>Effect$ = createEffect(() => {
     return this.actions$.pipe(

package/schematics/imng-sub-list/files/__pluralizedName@dasherize__-list/api.service.ts.template

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { NrsrxBaseApiClientService } from 'imng-nrsrx-client-utils';
 import { HttpClient } from '@angular/common/http';
 import { environment } from '@env';
@@ -8,7 +8,7 @@ import { environment } from '@env';
 })
 export class <%= classify(singularizedName) %>ApiService extends NrsrxBaseApiClientService<I<%= classify(singularizedName) %>> {
   public override url = environment.webApiEndpoints.<%= camelize(pluralizedName) %>;
-  constructor(http: HttpClient) {
-    super(http);
+  constructor() {
+    super(inject(HttpClient));
   }
 }

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

@@ -10,20 +10,25 @@
     </div>
   </ng-template>
 <% swaggerProperties.forEach(function(swaggerProperty) {%><% if ((swaggerProperty.format === 'date-time' || swaggerProperty.format === 'date') && swaggerProperty.name.toLowerCase().endsWith('utc') ) { %>
-  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" format="{0:MM/dd/yy HH:mm}" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>>
+  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" format="{0:MM/dd/yy HH:mm}" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">
 <%} else if (swaggerProperty.format === 'date-time' || swaggerProperty.format === 'date') { %>
-  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" format="{0:MM/dd/yy}" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>>
+  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" format="{0:MM/dd/yy}" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">
 <%} else if (swaggerProperty.type === 'boolean') { %>
-  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>>
+  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">
     <ng-template kendoGridCellTemplate let-dataItem>
       <div *ngIf="dataItem.<%= underscore(swaggerProperty.name) %>">
         <span class="text-success font-weight-bolder h2" placement="left" tooltip="Active">
           <span class="k-icon k-i-check-circle"></span>
         </span>
       </div>
+      @if (dataItem[props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>]) {
+        <kendo-svgicon class="text-success font-weight-bolder h2" [icon]="icons.check" size="xlarge"></kendo-svgicon>
+      } @else {
+        <kendo-svgicon class="text-danger font-weight-bolder h2" [icon]="icons.cancel" size="xlarge"></kendo-svgicon>
+      }
     </ng-template>
 <%} else if (swaggerProperty.format === 'uuid') { %>
-  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>>
+  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">
     <ng-template kendoGridCellTemplate let-dataItem>
       <imng-kendo-copy
         [displayValue]="dataItem[props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>] | slice:0:5"
@@ -38,7 +43,7 @@
     [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>"
     [width]="100"
     title="<%= swaggerProperty.startCaseName %>"
-    filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>>
+    filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">
     <ng-template kendoGridFilterMenuTemplate let-column="column">
       <imng-multi-select-filter
         [isPrimitive]="false"
@@ -54,12 +59,12 @@
 <%} else if (swaggerProperty.htmlInputType === 'object') { %>
   <kendo-grid-column
     [field]="getRelatedField(props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>, <%= camelize(swaggerProperty.name) %>Props.<%= swaggerProperty.firstProperty?.snakeCaseName.toUpperCase() %>)"
-    [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>>
+    [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">
     <ng-template kendoGridCellTemplate let-dataItem>
       {{ getRelatedValue(dataItem, props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>, <%= camelize(swaggerProperty.name) %>Props.<%= swaggerProperty.firstProperty?.snakeCaseName.toUpperCase() %>) }}
     </ng-template>
 <%} else { %>
-  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>>
+  <kendo-grid-column [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" [width]="100" title="<%= swaggerProperty.startCaseName %>" filter="<%= swaggerProperty.filterExpression %>" [hidden]="<%= swaggerProperty.hidden %>">
 <%} %>    <ng-template class="header" kendoGridHeaderTemplate let-column>
       <span class="h6"><%= swaggerProperty.startCaseName %></span>
     </ng-template>

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

@@ -1,4 +1,4 @@
-import { Component, ChangeDetectionStrategy, Input } from '@angular/core';
+import { Component, ChangeDetectionStrategy, Input, inject } from '@angular/core';
 import { KendoODataBasedComponent } from 'imng-kendo-grid-odata';
 import { ODataState } from 'imng-kendo-odata';
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
@@ -10,6 +10,7 @@ import { <%= camelize(singularizedName) %>GridState } from './list.grid-state';
   styleUrls: ['./list.component.scss'],
   providers: [<%= classify(singularizedName) %>ListFacade],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: false,
 })
 export class <%= classify(singularizedName) %>ListComponent extends KendoODataBasedComponent<I<%= classify(singularizedName) %>, <%= classify(singularizedName) %>ListFacade> {
   public readonly props = <%= classify(singularizedName) %>Properties;<% swaggerObjectProperties.filter(t=> !t.enum).forEach(function(swaggerProperty){ %>
@@ -17,8 +18,8 @@ export class <%= classify(singularizedName) %>ListComponent extends KendoODataBa
   public readonly <%= camelize(swaggerProperty.pluralizedPropertyTypeName) %> = <%= camelize(swaggerProperty.singularizedPropertyTypeName) %>Values;<% }) %>
   public currentItem: I<%= classify(singularizedName) %> | undefined;
 
-  constructor(facade: <%= classify(singularizedName) %>ListFacade) {
-    super(facade, <%= camelize(singularizedName) %>GridState);
+  constructor() {
+    super(inject(<%= classify(singularizedName) %>ListFacade), <%= camelize(singularizedName) %>GridState);
   }
 
   @Input()

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

@@ -13,6 +13,7 @@ import { <%= camelize(singularizedName) %>Selectors } from '../+state/<%= dasher
 @Injectable()
 export class <%= classify(singularizedName) %>ListFacade implements IKendoODataGridFacade<I<%= classify(name) %>>, IDataDeleteFacade<I<%= classify(name) %>> {
   private _parentGridId = '';
+  private readonly store = inject(Store);
   public parentGrid$ = new BehaviorSubject<string>('');
   public get parentGridId() {
     return this._parentGridId;
@@ -33,8 +34,6 @@ export class <%= classify(singularizedName) %>ListFacade implements IKendoODataG
     switchMap(x =>
       this.store.select(<%= camelize(singularizedName) %>Selectors.selectODataState$(x))));
 
-  constructor(private readonly store: Store) {}
-
   public loadEntities(odataState: ODataState): void {
     odataState = applyFilter({ ...odataState },
       { field: <%= classify(singularizedName) %>Properties.<%= classify(snakeCasedParentName) %>_ID, operator: 'eq', value: this.parentGridId });

package/schematics/imng-sub-list/schema.json

@@ -1,42 +1,45 @@
 {
-    "$schema": "http://json-schema.org/schema",
-    "$id": "imng-sub-list",
-    "type": "object",
-    "properties": {
-      "name": {
-        "type": "string",
-        "description": "Entity name",
-        "$default": {
-          "$source": "argv",
-          "index": 0
-        }
-      },
-      "parentName": {
-        "type": "string",
-        "description": "Parent Entity name"
-      },
-      "storeName": {
-        "type": "string",
-        "description": "NGRX Feature Store name"
-      },
-      "path": {
-        "type": "string",
-        "description": "Directory where you would like the output to go"
-      },
-      "openApiJsonUrl": {
-        "type": "string",
-        "description": "URL of swagger page"
-      },
-      "openApiJsonFileName": {
-        "type": "string",
-        "description": "Relative file name and path"
-      },
-      "appPrefix": {
-        "type": "string",
-        "default": "imng",
-        "description": "Application selector prefix for components and directives."
+  "$schema": "http://json-schema.org/schema",
+  "$id": "imng-sub-list",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "Entity name",
+      "$default": {
+        "$source": "argv",
+        "index": 0
       }
     },
-    "required": ["name", "path"]
-  }
-  
+    "parentName": {
+      "type": "string",
+      "description": "Parent Entity name"
+    },
+    "storeName": {
+      "type": "string",
+      "description": "NGRX Feature Store name"
+    },
+    "path": {
+      "type": "string",
+      "description": "Directory where you would like the output to go"
+    },
+    "openApiJsonUrl": {
+      "type": "string",
+      "description": "URL of OpenApi Json document"
+    },
+    "openApiJsonFileName": {
+      "type": "string",
+      "description": "Relative file name and path of OpenApi json document"
+    },
+    "appPrefix": {
+      "type": "string",
+      "default": "imng",
+      "description": "Application selector prefix for components and directives."
+    },
+    "modelFolderLocation": {
+      "type": "string",
+      "description": "Location of the model folder (relative to the generated component root)"
+    }
+  },
+  "required": ["name", "path"]
+}

package/schematics/shared/options.d.ts

@@ -15,6 +15,8 @@ export interface IOptions {
     /** Optional: File path of local OpenApi JSON document (If this is not provided, then you must specify openApiJsonUrl) */
     openApiJsonFileName?: string;
     /** Optional: This is the property that will used for initial sorting on list and auto focus on crud schematics */
+    modelFolderLocation?: string;
+    /** Optional: Location of model files relative to the module/component generated root */
     firstProperty?: PropertyInfo;
     /** Ignore: This is for internal schematic use only  */
     swaggerProperties: PropertyInfo[];