DECAF-169 update

src/app/components/select-field/select-field.component.ts

@@ -1,5 +1,9 @@
 import { Component, HostListener, inject, OnDestroy } from '@angular/core';
-import { TranslatePipe } from '@ngx-translate/core';
+import { FormGroup } from '@angular/forms';
+import { Condition } from '@decaf-ts/core';
+import { OperationKeys } from '@decaf-ts/db-decorators';
+import { Model } from '@decaf-ts/decorator-validation';
+import { ComponentEventNames } from '@decaf-ts/ui-decorators';
 import {
   IonButton,
   IonItem,
@@ -10,21 +14,17 @@ import {
   SelectChangeEventDetail,
   SelectCustomEvent,
 } from '@ionic/angular/standalone';
-import { FormGroup } from '@angular/forms';
-import { Condition } from '@decaf-ts/core';
-import { Model } from '@decaf-ts/decorator-validation';
-import { OperationKeys } from '@decaf-ts/db-decorators';
-import { ComponentEventNames } from '@decaf-ts/ui-decorators';
-import { RouterService } from 'src/app/services/router.service';
+import { TranslatePipe } from '@ngx-translate/core';
 import { Batch } from 'src/app/ew/fabric/Batch';
-import { getDocumentTypes } from 'src/app/ew/utils/helpers';
 import { Product } from 'src/app/ew/fabric/Product';
-import { ForAngularCommonModule } from 'src/lib/for-angular-common.module';
-import { IconComponent } from 'src/lib/components/icon/icon.component';
+import { getDocumentTypes } from 'src/app/ew/utils/helpers';
 import { CrudFieldComponent } from 'src/lib/components/crud-field/crud-field.component';
-import { getOnWindow, setOnWindow, windowEventEmitter } from 'src/lib/utils/helpers';
+import { IconComponent } from 'src/lib/components/icon/icon.component';
 import { Dynamic } from 'src/lib/engine/decorators';
 import { getModelAndRepository } from 'src/lib/engine/helpers';
+import { ForAngularCommonModule } from 'src/lib/for-angular-common.module';
+import { NgxRouterService } from 'src/lib/services';
+import { getOnWindow, setOnWindow, windowEventEmitter } from 'src/lib/utils/helpers';
 
 @Dynamic()
 @Component({
@@ -46,7 +46,7 @@ import { getModelAndRepository } from 'src/lib/engine/helpers';
   standalone: true,
 })
 export class AppSelectFieldComponent extends CrudFieldComponent implements OnDestroy {
-  routerService: RouterService = inject(RouterService);
+  override routerService: NgxRouterService = inject(NgxRouterService);
 
   override async onDestroy(): Promise<void> {
     super.onDestroy();

src/app/ew/fabric/forms/BatchForm.ts

@@ -1,43 +1,31 @@
-import { Model, ModelArg } from '@decaf-ts/decorator-validation';
-import { date, list, minlength, model, pattern, required } from '@decaf-ts/decorator-validation';
-import { column, index, OrderDirection, pk, table } from '@decaf-ts/core';
-import { BlockOperations, composed, OperationKeys, readonly } from '@decaf-ts/db-decorators';
+import { column, index, OrderDirection, table } from '@decaf-ts/core';
+import { readonly } from '@decaf-ts/db-decorators';
 import { description } from '@decaf-ts/decoration';
-import { Cacheable } from '../Cacheable';
+import { date, Model, model, ModelArg, required } from '@decaf-ts/decorator-validation';
 import {
-  ComponentEventNames,
   DecafComponent,
   hidden,
   HTML5InputTypes,
-  TransactionHooks,
-  uichild,
   uielement,
-  uihandlers,
   uilayout,
   uilayoutprop,
   uilistmodel,
-  uilistprop,
-  uimodel,
   uionclick,
   uionrender,
   uiorder,
   uitablecol,
 } from '@decaf-ts/ui-decorators';
-import { DatePattern, TableNames } from '../constants';
-import { audit } from '../utils';
+import { Batch } from '../Batch';
 import { Product } from '../Product';
-import { DatamatrixModalHandler } from '../handlers/DatamatrixModalHandler';
+import { DatePattern, TableNames } from '../constants';
 import { BatchHandler } from '../handlers/BatchHandler';
-import { Batch } from '../Batch';
+import { DatamatrixModalHandler } from '../handlers/DatamatrixModalHandler';
 
 //@uses(FabricFlavour)
 
 @table(TableNames.Batch)
 @uilistmodel('ngx-decaf-list-item', { icon: 'ti-package' })
 @uilayout('ngx-decaf-crud-form', true, 1, { empty: { showButton: false } })
-@uihandlers({
-  [ComponentEventNames.Render]: BatchHandler,
-})
 @model()
 export class BatchForm extends Batch {
   //only for ui (table view)
@@ -162,7 +150,6 @@ export class BatchForm extends Batch {
     type: HTML5InputTypes.TEXT,
   })
   @uilayoutprop('half')
-  @uionrender(() => BatchHandler)
   @uitablecol(4, (instance: DecafComponent<Model>, prop: 'expiryDate', value: string) => {
     return value;
   })

src/app/pages/model/model.page.ts

@@ -1,16 +1,16 @@
 import { Component, OnInit } from '@angular/core';
+import { Model } from '@decaf-ts/decorator-validation';
+import { ComponentEventNames } from '@decaf-ts/ui-decorators';
 import { IonContent } from '@ionic/angular/standalone';
 import { TranslatePipe } from '@ngx-translate/core';
-import { ComponentEventNames } from '@decaf-ts/ui-decorators';
-import { ModelRendererComponent } from 'src/lib/components/model-renderer/model-renderer.component';
-import { HeaderComponent } from 'src/app/components/header/header.component';
 import { ContainerComponent } from 'src/app/components/container/container.component';
-import { ListComponent } from 'src/lib/components/list/list.component';
-import { NgxModelPageDirective } from 'src/lib/engine/NgxModelPageDirective';
-import { CardComponent, EmptyStateComponent } from 'src/lib/components';
+import { HeaderComponent } from 'src/app/components/header/header.component';
 import { getNgxToastComponent } from 'src/app/utils/NgxToastComponent';
+import { CardComponent, EmptyStateComponent } from 'src/lib/components';
+import { ListComponent } from 'src/lib/components/list/list.component';
+import { ModelRendererComponent } from 'src/lib/components/model-renderer/model-renderer.component';
 import { ICrudFormEvent, IModelComponentSubmitEvent } from 'src/lib/engine/interfaces';
-import { Model } from '@decaf-ts/decorator-validation';
+import { NgxModelPageDirective } from 'src/lib/engine/NgxModelPageDirective';
 import { CrudEvent } from 'src/lib/engine/types';
 
 /**
@@ -125,8 +125,9 @@ export class ModelPage extends NgxModelPageDirective implements OnInit {
   // }
 
   async ngOnInit(): Promise<void> {
-    this.enableCrudOperations();
     await super.initialize();
+    this.enableCrudOperations();
+
     console.log(this.modelId);
   }
 
@@ -140,7 +141,7 @@ export class ModelPage extends NgxModelPageDirective implements OnInit {
     if (name === ComponentEventNames.Submit) {
       const { success, message } = (await super.submit(
         event as CrudEvent<M>,
-        true,
+        true
       )) as IModelComponentSubmitEvent<Model>;
       const toast = getNgxToastComponent();
       await toast.show({