avoid hard migration by simlifying the fix of ngrx read only and prim…

…eng lazyLoad (#159) Co-authored-by: Loïc BURELOUX <loic.bureloux.ext@safrangroup.com>
BIATeam · Oct 1, 2024 · 588498b · 588498b
1 parent 5038ede
commit 588498b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/...res/bia-features/notifications/views/notifications-index/notifications-index.component.ts b/...res/bia-features/notifications/views/notifications-index/notifications-index.component.ts
@@ -25,7 +25,6 @@ import {
 import { KeyValuePair } from 'src/app/shared/bia-shared/model/key-value-pair';
 import { PagingFilterFormatDto } from 'src/app/shared/bia-shared/model/paging-filter-format';
 import { TableHelperService } from 'src/app/shared/bia-shared/services/table-helper.service';
-import { clone } from 'src/app/shared/bia-shared/utils';
 import { DEFAULT_PAGE_SIZE } from 'src/app/shared/constants';
 import { Permission } from 'src/app/shared/permission';
 import { AppState } from 'src/app/store/state';
@@ -181,14 +180,7 @@ export class NotificationsIndexComponent implements OnInit, OnDestroy {
   onLoadLazy(lazyLoadEvent: TableLazyLoadEvent) {
     const pagingAndFilter: PagingFilterFormatDto = {
       parentIds: this.parentIds,
-      filters: clone(lazyLoadEvent.filters),
-      first: lazyLoadEvent.first,
-      globalFilter: clone(lazyLoadEvent.globalFilter),
-      last: lazyLoadEvent.last,
-      multiSortMeta: clone(lazyLoadEvent.multiSortMeta),
-      rows: lazyLoadEvent.rows,
-      sortField: lazyLoadEvent.sortField,
-      sortOrder: lazyLoadEvent.sortOrder,
+      ...lazyLoadEvent,
     };
     this.store.dispatch(
       FeatureNotificationsActions.loadAllByPost({ event: pagingAndFilter })

diff --git a/Angular/src/app/features/planes-full-code/views/planes-index/planes-index.component.ts b/Angular/src/app/features/planes-full-code/views/planes-index/planes-index.component.ts
@@ -25,7 +25,6 @@ import {
 import { KeyValuePair } from 'src/app/shared/bia-shared/model/key-value-pair';
 import { PagingFilterFormatDto } from 'src/app/shared/bia-shared/model/paging-filter-format';
 import { TableHelperService } from 'src/app/shared/bia-shared/services/table-helper.service';
-import { clone } from 'src/app/shared/bia-shared/utils';
 import { DEFAULT_PAGE_SIZE } from 'src/app/shared/constants';
 import { Permission } from 'src/app/shared/permission';
 import { AppState } from 'src/app/store/state';
@@ -213,14 +212,7 @@ export class PlanesIndexComponent implements OnInit, OnDestroy {
   onLoadLazy(lazyLoadEvent: TableLazyLoadEvent) {
     const pagingAndFilter: PagingFilterFormatDto = {
       parentIds: this.parentIds,
-      filters: clone(lazyLoadEvent.filters),
-      first: lazyLoadEvent.first,
-      globalFilter: clone(lazyLoadEvent.globalFilter),
-      last: lazyLoadEvent.last,
-      multiSortMeta: clone(lazyLoadEvent.multiSortMeta),
-      rows: lazyLoadEvent.rows,
-      sortField: lazyLoadEvent.sortField,
-      sortOrder: lazyLoadEvent.sortOrder,
+      ...lazyLoadEvent,
     };
     this.store.dispatch(
       FeaturePlanesActions.loadAllByPost({ event: pagingAndFilter })

diff --git a/Angular/src/app/shared/bia-shared/components/table/bia-table/bia-table.component.ts b/Angular/src/app/shared/bia-shared/components/table/bia-table/bia-table.component.ts
@@ -24,6 +24,7 @@ import {
 } from '../../../model/bia-field-config';
 import { BiaTableState } from '../../../model/bia-table-state';
 import { KeyValuePair } from '../../../model/key-value-pair';
+import { TableHelperService } from '../../../services/table-helper.service';
 
 const objectsEqual = (o1: any, o2: any) =>
   Object.keys(o1).length === Object.keys(o2).length &&
@@ -415,7 +416,9 @@ export class BiaTableComponent implements OnChanges, AfterContentInit {
 
   onLoadLazy(event: TableLazyLoadEvent) {
     this.saveTableState();
-    setTimeout(() => this.loadLazy.emit(event), 0);
+    const tableLazyLoadCopy: TableLazyLoadEvent =
+      TableHelperService.copyTableLazyLoadEvent(event);
+    setTimeout(() => this.loadLazy.emit(tableLazyLoadCopy), 0);
   }
 
   onSelectionChange() {
@@ -518,7 +521,11 @@ export class BiaTableComponent implements OnChanges, AfterContentInit {
   }
 
   getLazyLoadMetadata(): TableLazyLoadEvent {
-    return this.table?.createLazyLoadMetadata();
+    const lazyLoadEvent = this.table?.createLazyLoadMetadata();
+    if (lazyLoadEvent) {
+      return TableHelperService.copyTableLazyLoadEvent(lazyLoadEvent);
+    }
+    return {};
   }
 
   getLazyLoadOnInit(): boolean {

diff --git a/...-shared/feature-templates/crud-items/views/crud-items-index/crud-items-index.component.ts b/...-shared/feature-templates/crud-items/views/crud-items-index/crud-items-index.component.ts
@@ -26,7 +26,6 @@ import { BiaTableState } from 'src/app/shared/bia-shared/model/bia-table-state';
 import { KeyValuePair } from 'src/app/shared/bia-shared/model/key-value-pair';
 import { PagingFilterFormatDto } from 'src/app/shared/bia-shared/model/paging-filter-format';
 import { TableHelperService } from 'src/app/shared/bia-shared/services/table-helper.service';
-import { clone } from 'src/app/shared/bia-shared/utils';
 import { DEFAULT_PAGE_SIZE, TeamTypeId } from 'src/app/shared/constants';
 import { AppState } from 'src/app/store/state';
 import { CrudItemTableComponent } from '../../components/crud-item-table/crud-item-table.component';
@@ -325,14 +324,7 @@ export class CrudItemsIndexComponent<CrudItem extends BaseDto>
     const pagingAndFilter: PagingFilterFormatDto = {
       advancedFilter: this.crudConfiguration.fieldsConfig.advancedFilter,
       parentIds: this.crudItemService.getParentIds().map(id => id.toString()),
-      filters: clone(lazyLoadEvent.filters),
-      first: lazyLoadEvent.first,
-      globalFilter: clone(lazyLoadEvent.globalFilter),
-      last: lazyLoadEvent.last,
-      multiSortMeta: clone(lazyLoadEvent.multiSortMeta),
-      rows: lazyLoadEvent.rows,
-      sortField: lazyLoadEvent.sortField,
-      sortOrder: lazyLoadEvent.sortOrder,
+      ...lazyLoadEvent,
     };
     this.crudItemService.loadAllByPost(pagingAndFilter);
     this.hasColumnFilter =

diff --git a/Angular/src/app/shared/bia-shared/services/table-helper.service.ts b/Angular/src/app/shared/bia-shared/services/table-helper.service.ts
@@ -1,12 +1,29 @@
 import { Injectable } from '@angular/core';
 import { FilterMetadata } from 'primeng/api';
+import { TableLazyLoadEvent } from 'primeng/table';
 import { TABLE_FILTER_GLOBAL } from '../../constants';
 import { BiaTableComponent } from '../components/table/bia-table/bia-table.component';
+import { clone } from '../utils';
 
 @Injectable({
   providedIn: 'root',
 })
 export class TableHelperService {
+  static copyTableLazyLoadEvent(
+    lazyLoadEvent: TableLazyLoadEvent
+  ): TableLazyLoadEvent {
+    return {
+      filters: clone(lazyLoadEvent.filters),
+      first: lazyLoadEvent.first,
+      globalFilter: clone(lazyLoadEvent.globalFilter),
+      last: lazyLoadEvent.last,
+      multiSortMeta: clone(lazyLoadEvent.multiSortMeta),
+      rows: lazyLoadEvent.rows,
+      sortField: lazyLoadEvent.sortField,
+      sortOrder: lazyLoadEvent.sortOrder,
+    };
+  }
+
   public hasFilter(biaTableComponent: BiaTableComponent): boolean {
     if (this.isNullUndefEmptyStr(biaTableComponent)) {
       return false;