imng-kendo-schematics 7.222.4 → 7.291.2

package/package.json

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

package/schematics/imng-crud/files/add-edit.component.html.template

@@ -1,7 +1,7 @@
 <imng-data-entry-dialog id="dataEntry<%= startCasedPluralName %>" name="dataEntry<%= startCasedPluralName %>" [width]="700" [height]="550" [parentComponent]="this" autoFocusedElement="#<%= underscore(firstProperty.name) %>">
   <form id="imng-form" novalidate [formGroup]="addEditForm" autocomplete="false" class="row needs-validation"><% swaggerProperties.forEach(function(swaggerProperty) {%>
     <div class="col-md-6">
-      <label for="<%= underscore(swaggerProperty.name) %>" class="control-label<% if (swaggerProperty.htmlInputType === 'checkbox') { %> me-4 mt-4<% } %>"><%= swaggerProperty.startCaseName %>:</label><% if (swaggerProperty.htmlInputType === 'checkbox') { %>
+      <label for="<%= underscore(swaggerProperty.name) %>" class="control-label<% if (swaggerProperty.htmlInputType === 'checkbox') { %> me-4 mt-4<% } %>"><%= swaggerProperty.startCaseName %>:<% if(swaggerProperty.required) { %> <span class="text-danger">*</span><% } %></label><% if (swaggerProperty.htmlInputType === 'checkbox') { %>
       <input id="<%= underscore(swaggerProperty.name) %>" type="<%= swaggerProperty.htmlInputType %>" [formControlName]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>" />
     </div><%} else if (swaggerProperty.enum){ %>
       <kendo-combobox

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

@@ -79,8 +79,8 @@
       <imng-multi-select-filter
         [isPrimitive]="false"
         [odataState]="facade.gridODataState$ | async"
-        [textField]="ENUM_DISPLAY_TEXT"
-        [valueField]="ENUM_NAME"
+        [textField]="EnumProperties.DISPLAY_TEXT"
+        [valueField]="EnumProperties.NAME"
         [data]="<%= camelize(swaggerProperty.pluralizedPropertyTypeName) %>"
         [field]="props.<%= swaggerProperty.snakeCaseName.toUpperCase() %>"></imng-multi-select-filter>
     </ng-template>

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

@@ -0,0 +1,47 @@
+import { on } from '@ngrx/store';
+import * as <%= camelize(singularizedName) %>ActionTypes from './<%= dasherize(singularizedName) %>.actions';
+import { State } from './<%= dasherize(parentName) %>.feature';
+import { findAndModify } from 'imng-ngrx-utils';
+import { getODataPagerSettings } from 'imng-kendo-grid-odata';
+
+export const <%= camelize(singularizedName) %>Reducers = [
+    on(<%= camelize(singularizedName) %>ActionTypes.load<%= classify(pluralizedName) %>Request,
+      (state: State, { payload }): State =>
+      ({
+        ...state,
+        loading: true,
+        gridData: {
+          ...state.gridData,
+          data: findAndModify(
+            state.gridData.data,
+            payload.<%= camelize(parentName) %>Id,
+            (rec) => (rec.<%= camelize(singularizedName) %>ODataState = payload.odataState),
+          )
+        },
+      })),
+    on(<%= camelize(singularizedName) %>ActionTypes.reload<%= classify(pluralizedName) %>Request,
+      (state: state): State =>
+      ({
+        ...state,
+        loading: true
+      })),
+    on(<%= camelize(singularizedName) %>ActionTypes.load<%= classify(pluralizedName) %>Success,
+      <%= camelize(singularizedName) %>ActionTypes.reload<%= classify(pluralizedName) %>Success,
+      (state: State, { payload }): State =>
+      ({
+        ...state,
+        loading: false,
+        gridData: {
+          ...state.gridData,
+          data: findAndModify(
+            state.gridData.data, 
+            payload.<%= camelize(parentName) %>Id, 
+            (rec) => {
+              rec.<%= camelize(singularizedName) %>OData = payload.odataResult;
+              rec.<%= camelize(singularizedName) %>PagerSettings = getODataPagerSettings({
+                gridData: payload.odataResult,
+                gridODataState: rec.<%= camelize(singularizedName) %>ODataState,
+            });
+          }),
+        },
+      }))];

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

@@ -2,7 +2,7 @@ import { createSelector } from '@ngrx/store';
 import { PagerSettings } from '@progress/kendo-angular-grid';
 import { createEmptyODataResult } from 'imng-kendo-odata';
 import { getById } from 'imng-ngrx-utils';
-import { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedStoreName) %>.reducer';
+import { <%= camelize(pluralizedStoreName) %>Feature } from './<%= dasherize(singularizedStoreName) %>.feature';
 <% if (openApiJsonUrl || openApiJsonFileName) { %>
 const select<%= classify(pluralizedName) %> = (<%= camelize(parentName) %>Id: string) => createSelector(
   <%= camelize(pluralizedStoreName) %>Feature.selectGridData,

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

@@ -1,7 +1,7 @@
 <kendo-grid [height]="375" kendoGridFocusable [imngODataGrid]="this">
   <ng-template kendoGridToolbarTemplate>
     <div class="w-100 d-flex justify-content-between">
-      <h3><%= startCasedPluralName %></h3>
+      <h4><%= startCasedPluralName %></h4>
       <imng-kendo-odata-grid-header
         (reloadEntitiesClicked)="reloadEntities()"
         [hideClearFilters]="true"

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

@@ -22,7 +22,7 @@ const initialGridState: ODataState = {
 })
 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){ %>
-  public readonly <%= camelize(swaggerProperty.name) %>props = <%= classify(swaggerProperty.propertyTypeName) %>Properties;<% }) %>
+  public readonly <%= camelize(swaggerProperty.name) %>Props = <%= classify(swaggerProperty.propertyTypeName) %>Properties;<% }) %>
   public currentItem: I<%= classify(singularizedName) %> | undefined;
 
   constructor(facade: <%= classify(singularizedName) %>ListFacade) {

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

@@ -11,9 +11,9 @@ import { Observable, of } from 'rxjs';
 import * as <%= camelize(parentName) %>ActionTypes from '../+state/<%= dasherize(parentName) %>.actions';
 import * as <%= camelize(singularizedName) %>ActionTypes from '../+state/<%= dasherize(singularizedName) %>.actions';
 import { <%= classify(singularizedName) %>Effects } from '../+state/<%= dasherize(singularizedName) %>.effects';
-import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.reducer';
+import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.feature';
 import { <%= classify(singularizedName) %>ListFacade } from './list.facade';
-import { <%= classify(parentName) %>Effects } from '../+state/<%= dasherize(parentName) %>.effects';
+import { <%= classify(parentName) %>ListEffects } from '../+state/<%= dasherize(parentName) %>-list.effects';
 import { environment } from '@env';
 
 describe('<%= classify(singularizedName) %>ListFacade', () => {
@@ -29,7 +29,7 @@ describe('<%= classify(singularizedName) %>ListFacade', () => {
       @NgModule({
         imports: [
           StoreModule.forFeature(<%= camelize(pluralizedStoreName) %>Feature),
-          EffectsModule.forFeature([<%= classify(singularizedStoreName) %>Effects, <%= classify(singularizedName) %>Effects]),
+          EffectsModule.forFeature([<%= classify(singularizedStoreName) %>Effects, <%= classify(singularizedName) %>ListEffects]),
         ],
         providers: [
           <%= classify(singularizedName) %>ListFacade,
@@ -67,7 +67,7 @@ describe('<%= classify(singularizedName) %>ListFacade', () => {
 
       list = await readFirst(facade.gridData$);
       const loading = await readFirst(facade.loading$);
-      expect(list.?data.length).toBe(1);
+      expect(list?.data.length).toBe(1);
       expect(loading).toBe(false);
 
       const gridPagerSettings$ = await readFirst(facade.gridPagerSettings$);

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

@@ -7,7 +7,7 @@ import { applyFilter, ODataResult, ODataState } from 'imng-kendo-odata';
 import { BehaviorSubject, Observable, switchMap } from 'rxjs';
 
 import * as <%= camelize(singularizedName) %>ActionTypes from '../+state/<%= dasherize(singularizedName) %>.actions';
-import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.reducer';
+import { <%= camelize(pluralizedStoreName) %>Feature } from '../+state/<%= dasherize(singularizedStoreName) %>.feature';
 import { <%= camelize(singularizedName) %>Selectors } from '../+state/<%= dasherize(singularizedName) %>.selectors';
 
 @Injectable()