@sumaris-net/ngx-components 1.23.1-rc4 → 1.23.2

package/esm2015/src/app/shared/observables.js

@@ -5,32 +5,47 @@ import { isNotNil } from './functions';
 export function filterNotNil(obs) {
     return obs.pipe(filter(isNotNil));
 }
-export function firstNotNil(obs, opts) {
-    if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-        obs.pipe(takeUntil(timer(opts.timeout)), first(isNotNil));
-    }
-    return obs.pipe(first(isNotNil));
-}
 export function filterTrue(obs) {
     return obs.pipe(filter((v) => v === true));
 }
-export function filterFalse(obs) {
+export function filterFalse(obs, opts) {
     return obs.pipe(filter((v) => v === false));
 }
-export function firstTruePromise(obs, opts) {
-    if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-        return obs.pipe(takeUntil(timer(opts.timeout)), first((v) => v === true)).toPromise();
+function decorateForFirst(obs, opts) {
+    // Set take until notifier
+    const takeUntil$ = (opts === null || opts === void 0 ? void 0 : opts.stop) || ((opts === null || opts === void 0 ? void 0 : opts.timeout) && timer(opts.timeout));
+    if (takeUntil$) {
+        // When stop, throw an error (useful when used with a toPromise())
+        if (opts.stopError) {
+            return merge(obs.pipe(takeUntil(takeUntil$)), takeUntil$
+                .pipe(map(() => {
+                throw new Error(opts.timeout ? `Timeout ${opts.timeout}ms` : `Stop`);
+            })));
+        }
+        // Add a takeUntil
+        return obs.pipe(takeUntil(takeUntil$));
     }
-    return obs.pipe(first((v) => v === true)).toPromise();
+    return obs;
+}
+export function firstNotNil(obs, opts) {
+    return decorateForFirst(obs, opts).pipe(first(isNotNil));
+}
+export function firstTrue(obs, opts) {
+    return decorateForFirst(obs, opts).pipe(first((v) => v === true), map(_ => { }) // Convert to void
+    );
+}
+export function firstFalse(obs, opts) {
+    return decorateForFirst(obs, opts).pipe(first((v) => v === false), map(_ => { }) // Convert to void
+    );
+}
+export function firstTruePromise(obs, opts) {
+    return firstTrue(obs, Object.assign({ stopError: true }, opts)).toPromise();
 }
 export function firstFalsePromise(obs, opts) {
-    if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-        return obs.pipe(takeUntil(timer(opts.timeout)), first((v) => v === false)).toPromise();
-    }
-    return obs.pipe(first((v) => v === false)).toPromise();
+    return firstFalse(obs, Object.assign({ stopError: true }, opts)).toPromise();
 }
 export function firstNotNilPromise(obs, opts) {
-    return firstNotNil(obs, opts).toPromise();
+    return firstNotNil(obs, Object.assign({ stopError: true }, opts)).toPromise();
 }
 export function chainPromises(defers) {
     return (defers || []).reduce((previous, defer) => {
@@ -47,14 +62,6 @@ export function chainPromises(defers) {
             .then(jobRes => finalResult.concat(jobRes)));
     }, null);
 }
-export function firstTrue(obs) {
-    return obs.pipe(first(value => value === true), map(_ => { }) // Convert to void
-    );
-}
-export function firstFalse(obs) {
-    return obs.pipe(first(value => value === false), map(_ => { }) // Convert to void
-    );
-}
 /**
  * Wait form a predicate return true. This need to implement AppFormUtils.waitWhilePending(), AppFormUtils.waitIdle()
  * @param predicate
@@ -71,43 +78,22 @@ export function waitFor(predicate, opts) {
         // For DEBUG :
         //tap(() => console.debug("Waiting form idle...", form)),
         filter(_ => predicate()), map(_ => true));
-        // Add timeout
-        if (opts && opts.timeout) {
-            const $timeout = timer(opts.timeout);
-            wait$ = merge(wait$.pipe(takeUntil($timeout)), $timeout
-                .pipe(map(() => {
-                throw new Error(`Timeout waitIdle() - after ${opts.timeout}ms`);
-            })));
-        }
-        yield firstNotNilPromise(wait$);
+        yield firstNotNilPromise(wait$, opts);
     });
 }
 export function waitForTrue(observable, opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Timeout (+ dueTime)
-        if (opts && opts.timeout > 0) {
-            const $timeout = timer(opts.timeout);
-            return merge(timer(opts.dueTime || 0)
-                .pipe(switchMap(() => firstTrue(observable)), takeUntil($timeout)), $timeout
-                .pipe(map(() => {
-                throw new Error(`Timeout ready() - after ${opts.timeout}ms`);
-            })))
-                .toPromise();
-        }
-        // dueTime (without timeout)
-        if (opts && opts.dueTime > 0) {
-            return timer(opts.dueTime)
-                .pipe(switchMap(() => firstTrue(observable)))
-                .toPromise();
-        }
-        return firstTrue(observable).toPromise();
-    });
+    opts = Object.assign({ stopError: true }, opts);
+    // dueTime (without timeout)
+    if (opts && opts.dueTime > 0) {
+        return timer(opts.dueTime)
+            .pipe(switchMap(() => firstTrue(observable, opts)))
+            .toPromise();
+    }
+    return firstTrue(observable, opts).toPromise();
 }
 export function waitForFalse(observable, opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return waitForTrue(
-        // Inverse the logic
-        observable.pipe(map(v => v === false)), opts);
-    });
+    return waitForTrue(
+    // Inverse the logic
+    observable.pipe(map(v => v === false)), opts);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"observables.js","sourceRoot":"","sources":["../../../../../src/app/shared/observables.ts"],"names":[],"mappings":"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","sourcesContent":["import {merge, Observable, Subject, timer} from 'rxjs';\nimport { filter, first, map, switchMap, takeUntil } from 'rxjs/operators';\nimport { isNotNil } from './functions';\nimport {Predicate} from '@angular/core';\n\n\nexport function filterNotNil<T = any>(obs: Observable<T>): Observable<T> {\n  return obs.pipe(filter(isNotNil));\n}\nexport function firstNotNil<T = any>(obs: Observable<T>, opts?: {timeout: number;}): Observable<T> {\n  if (opts?.timeout > 0) {\n    obs.pipe(\n      takeUntil(timer(opts.timeout)),\n      first(isNotNil)\n    );\n  }\n  return obs.pipe(first(isNotNil));\n}\nexport function filterTrue(obs: Observable<boolean>): Observable<boolean> {\n  return obs.pipe(filter((v) => v === true));\n}\nexport function filterFalse(obs: Observable<boolean>): Observable<boolean> {\n  return obs.pipe(filter((v) => v === false));\n}\nexport function firstTruePromise(obs: Observable<boolean>, opts?: {timeout: number}): Promise<boolean> {\n  if (opts?.timeout > 0) {\n    return obs.pipe(\n      takeUntil(timer(opts.timeout)),\n      first((v) => v === true)\n    ).toPromise();\n  }\n  return obs.pipe(\n    first((v) => v === true)\n  ).toPromise();\n}\nexport function firstFalsePromise(obs: Observable<boolean>, opts?: {timeout: number}): Promise<boolean> {\n  if (opts?.timeout > 0) {\n    return obs.pipe(\n      takeUntil(timer(opts.timeout)),\n      first((v) => v === false)\n    ).toPromise();\n  }\n  return obs.pipe(\n    first((v) => v === false)\n  ).toPromise();\n}\nexport function firstNotNilPromise<T = any>(obs: Observable<T>, opts?: {timeout: number}): Promise<T> {\n  return firstNotNil(obs, opts).toPromise();\n}\nexport function chainPromises<T = any>(defers: (() => Promise<any>)[]): Promise<T[]> {\n  return (defers || []).reduce((previous: Promise<any> | null, defer) => {\n    // First job\n    if (!previous) {\n      return defer()\n        // Init the final result array, with the first result\n        .then(jobRes => [jobRes]);\n    }\n    // Other jobs\n    return previous\n      .then((finalResult) => defer()\n        // Add job result to final result array\n        .then(jobRes => finalResult.concat(jobRes)));\n  }, null);\n}\n\nexport declare interface WaitForOptions {\n  dueTime?: number;\n  checkPeriod?: number;\n  timeout?: number;\n}\n\nexport function firstTrue(obs: Observable<boolean>): Observable<void> {\n  return obs.pipe(\n    first(value => value === true),\n    map(_ => {}) // Convert to void\n  );\n}\nexport function firstFalse(obs: Observable<boolean>): Observable<void> {\n  return obs.pipe(\n    first(value => value === false),\n    map(_ => {}) // Convert to void\n  );\n}\n\n/**\n * Wait form a predicate return true. This need to implement AppFormUtils.waitWhilePending(), AppFormUtils.waitIdle()\n * @param predicate\n * @param opts\n */\nexport async function waitFor(predicate: Predicate<void>, opts?: WaitForOptions): Promise<void> {\n  if (predicate()) return Promise.resolve();\n\n  const period = opts && opts.checkPeriod || 300;\n  const dueTime = opts && opts.dueTime || period;\n  let wait$: Observable<boolean> = timer(dueTime, period)\n    .pipe(\n      // For DEBUG :\n      //tap(() => console.debug(\"Waiting form idle...\", form)),\n      filter(_ => predicate()),\n      map(_ => true)\n    );\n\n  // Add timeout\n  if (opts && opts.timeout) {\n    const $timeout = timer(opts.timeout);\n    wait$ = merge(\n      wait$.pipe(\n        takeUntil($timeout)\n      ),\n      $timeout\n        .pipe(map(() => {\n          throw new Error(`Timeout waitIdle() - after ${opts.timeout}ms`);\n        }))\n    );\n  }\n\n  await firstNotNilPromise(wait$);\n}\n\nexport async function waitForTrue(observable: Observable<boolean>, opts?: WaitForOptions): Promise<void> {\n\n  // Timeout (+ dueTime)\n  if (opts && opts.timeout > 0) {\n    const $timeout = timer(opts.timeout);\n    return merge(\n      timer(opts.dueTime || 0)\n        .pipe(\n          switchMap(() => firstTrue(observable)),\n          takeUntil($timeout)\n        ),\n      $timeout\n        .pipe(map(() => {\n          throw new Error(`Timeout ready() - after ${opts.timeout}ms`);\n        }))\n    )\n    .toPromise();\n  }\n  // dueTime (without timeout)\n  if (opts && opts.dueTime > 0) {\n    return timer(opts.dueTime)\n      .pipe(switchMap(() => firstTrue(observable)))\n      .toPromise();\n  }\n  return firstTrue(observable).toPromise();\n}\n\nexport async function waitForFalse(observable: Observable<boolean>, opts?: WaitForOptions): Promise<void> {\n  return waitForTrue(\n    // Inverse the logic\n    observable.pipe(map(v => v === false)\n  ), opts);\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"observables.js","sourceRoot":"","sources":["../../../../../src/app/shared/observables.ts"],"names":[],"mappings":"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","sourcesContent":["import {merge, Observable, Subject, timer} from 'rxjs';\nimport { filter, first, map, switchMap, takeUntil } from 'rxjs/operators';\nimport { isNotNil } from './functions';\nimport {Predicate} from '@angular/core';\n\nexport declare interface FirstOptions {\n  timeout?: number;\n  stop?: Observable<any>;\n  stopError?: boolean;\n}\n\nexport declare interface WaitForOptions extends FirstOptions{\n  dueTime?: number;\n  checkPeriod?: number;\n}\n\nexport function filterNotNil<T = any>(obs: Observable<T>): Observable<T> {\n  return obs.pipe(filter(isNotNil));\n}\n\nexport function filterTrue(obs: Observable<boolean>): Observable<boolean> {\n  return obs.pipe(filter((v) => v === true));\n}\nexport function filterFalse(obs: Observable<boolean>, opts?: FirstOptions): Observable<boolean> {\n  return obs.pipe(filter((v) => v === false));\n}\n\nfunction decorateForFirst<T = any>(obs: Observable<T>, opts?: FirstOptions): Observable<T> {\n  // Set take until notifier\n  const takeUntil$ = opts?.stop || (opts?.timeout && timer(opts.timeout));\n  if (takeUntil$) {\n\n    // When stop, throw an error (useful when used with a toPromise())\n    if (opts.stopError) {\n      return merge(\n        obs.pipe(\n          takeUntil(takeUntil$)\n        ),\n        takeUntil$\n          .pipe(map(() => {\n            throw new Error(opts.timeout ? `Timeout ${opts.timeout}ms` : `Stop`);\n          }))\n      );\n    }\n\n    // Add a takeUntil\n    return obs.pipe(\n        takeUntil(takeUntil$)\n      );\n  }\n  return obs;\n}\n\nexport function firstNotNil<T = any>(obs: Observable<T>, opts?: FirstOptions): Observable<T> {\n  return decorateForFirst(obs, opts).pipe(first(isNotNil));\n}\nexport function firstTrue(obs: Observable<boolean>, opts?: FirstOptions): Observable<void> {\n  return decorateForFirst(obs, opts).pipe(\n    first((v) => v === true),\n    map(_ => {}) // Convert to void\n  );\n}\nexport function firstFalse(obs: Observable<boolean>, opts?: FirstOptions): Observable<void> {\n  return decorateForFirst(obs, opts).pipe(\n    first((v) => v === false),\n    map(_ => {}) // Convert to void\n  );\n}\nexport function firstTruePromise(obs: Observable<boolean>, opts?: FirstOptions): Promise<void> {\n  return firstTrue(obs, {stopError: true, ...opts}).toPromise();\n}\nexport function firstFalsePromise(obs: Observable<boolean>, opts?: FirstOptions): Promise<void> {\n  return firstFalse(obs, {stopError: true, ...opts}).toPromise();\n}\nexport function firstNotNilPromise<T = any>(obs: Observable<T>, opts?: FirstOptions): Promise<T> {\n  return firstNotNil(obs, {stopError: true, ...opts}).toPromise();\n}\nexport function chainPromises<T = any>(defers: (() => Promise<any>)[]): Promise<T[]> {\n  return (defers || []).reduce((previous: Promise<any> | null, defer) => {\n    // First job\n    if (!previous) {\n      return defer()\n        // Init the final result array, with the first result\n        .then(jobRes => [jobRes]);\n    }\n    // Other jobs\n    return previous\n      .then((finalResult) => defer()\n        // Add job result to final result array\n        .then(jobRes => finalResult.concat(jobRes)));\n  }, null);\n}\n\n/**\n * Wait form a predicate return true. This need to implement AppFormUtils.waitWhilePending(), AppFormUtils.waitIdle()\n * @param predicate\n * @param opts\n */\nexport async function waitFor(predicate: Predicate<void>, opts?: WaitForOptions): Promise<void> {\n  if (predicate()) return Promise.resolve();\n\n  const period = opts && opts.checkPeriod || 300;\n  const dueTime = opts && opts.dueTime || period;\n  let wait$: Observable<boolean> = timer(dueTime, period)\n    .pipe(\n      // For DEBUG :\n      //tap(() => console.debug(\"Waiting form idle...\", form)),\n      filter(_ => predicate()),\n      map(_ => true)\n    );\n\n  await firstNotNilPromise(wait$, opts);\n}\n\nexport function waitForTrue(observable: Observable<boolean>, opts?: WaitForOptions): Promise<void> {\n  opts = {stopError: true, ...opts};\n  // dueTime (without timeout)\n  if (opts && opts.dueTime > 0) {\n    return timer(opts.dueTime)\n      .pipe(switchMap(() => firstTrue(observable, opts)))\n      .toPromise();\n  }\n  return firstTrue(observable, opts).toPromise();\n}\n\nexport function waitForFalse(observable: Observable<boolean>, opts?: WaitForOptions): Promise<void> {\n  return waitForTrue(\n    // Inverse the logic\n    observable.pipe(map(v => v === false)\n  ), opts);\n}\n"]}

package/fesm2015/sumaris-net.ngx-components.js

@@ -37,7 +37,7 @@ import { __awaiter, __decorate } from 'tslib';
 import * as i1$6 from '@angular/forms';
 import { Validators, NG_VALUE_ACCESSOR, FormGroupDirective, AbstractControl, FormGroup, FormArray, FormControl, ReactiveFormsModule, FormBuilder } from '@angular/forms';
 import { timer, merge, fromEvent, BehaviorSubject, Subscription, Subject, isObservable, from, of, noop as noop$9, Observable, defer, forkJoin, interval, combineLatest, EMPTY } from 'rxjs';
-import { filter, takeUntil, first, map, switchMap, tap, debounceTime, startWith, distinctUntilChanged, mergeMap, catchError, throttleTime, skip, bufferWhen, take } from 'rxjs/operators';
+import { filter, takeUntil, map, first, switchMap, tap, debounceTime, startWith, distinctUntilChanged, mergeMap, catchError, throttleTime, skip, bufferWhen, take } from 'rxjs/operators';
 import { trigger, transition, style, animate, state } from '@angular/animations';
 import * as i1$1 from '@ngx-translate/core';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
@@ -777,32 +777,47 @@ function focusPreviousInput(event, elements, opts) {
 function filterNotNil(obs) {
     return obs.pipe(filter(isNotNil));
 }
-function firstNotNil(obs, opts) {
-    if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-        obs.pipe(takeUntil(timer(opts.timeout)), first(isNotNil));
-    }
-    return obs.pipe(first(isNotNil));
-}
 function filterTrue(obs) {
     return obs.pipe(filter((v) => v === true));
 }
-function filterFalse(obs) {
+function filterFalse(obs, opts) {
     return obs.pipe(filter((v) => v === false));
 }
-function firstTruePromise(obs, opts) {
-    if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-        return obs.pipe(takeUntil(timer(opts.timeout)), first((v) => v === true)).toPromise();
+function decorateForFirst(obs, opts) {
+    // Set take until notifier
+    const takeUntil$ = (opts === null || opts === void 0 ? void 0 : opts.stop) || ((opts === null || opts === void 0 ? void 0 : opts.timeout) && timer(opts.timeout));
+    if (takeUntil$) {
+        // When stop, throw an error (useful when used with a toPromise())
+        if (opts.stopError) {
+            return merge(obs.pipe(takeUntil(takeUntil$)), takeUntil$
+                .pipe(map(() => {
+                throw new Error(opts.timeout ? `Timeout ${opts.timeout}ms` : `Stop`);
+            })));
+        }
+        // Add a takeUntil
+        return obs.pipe(takeUntil(takeUntil$));
     }
-    return obs.pipe(first((v) => v === true)).toPromise();
+    return obs;
+}
+function firstNotNil(obs, opts) {
+    return decorateForFirst(obs, opts).pipe(first(isNotNil));
+}
+function firstTrue(obs, opts) {
+    return decorateForFirst(obs, opts).pipe(first((v) => v === true), map(_ => { }) // Convert to void
+    );
+}
+function firstFalse(obs, opts) {
+    return decorateForFirst(obs, opts).pipe(first((v) => v === false), map(_ => { }) // Convert to void
+    );
+}
+function firstTruePromise(obs, opts) {
+    return firstTrue(obs, Object.assign({ stopError: true }, opts)).toPromise();
 }
 function firstFalsePromise(obs, opts) {
-    if ((opts === null || opts === void 0 ? void 0 : opts.timeout) > 0) {
-        return obs.pipe(takeUntil(timer(opts.timeout)), first((v) => v === false)).toPromise();
-    }
-    return obs.pipe(first((v) => v === false)).toPromise();
+    return firstFalse(obs, Object.assign({ stopError: true }, opts)).toPromise();
 }
 function firstNotNilPromise(obs, opts) {
-    return firstNotNil(obs, opts).toPromise();
+    return firstNotNil(obs, Object.assign({ stopError: true }, opts)).toPromise();
 }
 function chainPromises(defers) {
     return (defers || []).reduce((previous, defer) => {
@@ -819,14 +834,6 @@ function chainPromises(defers) {
             .then(jobRes => finalResult.concat(jobRes)));
     }, null);
 }
-function firstTrue(obs) {
-    return obs.pipe(first(value => value === true), map(_ => { }) // Convert to void
-    );
-}
-function firstFalse(obs) {
-    return obs.pipe(first(value => value === false), map(_ => { }) // Convert to void
-    );
-}
 /**
  * Wait form a predicate return true. This need to implement AppFormUtils.waitWhilePending(), AppFormUtils.waitIdle()
  * @param predicate
@@ -843,44 +850,23 @@ function waitFor(predicate, opts) {
         // For DEBUG :
         //tap(() => console.debug("Waiting form idle...", form)),
         filter(_ => predicate()), map(_ => true));
-        // Add timeout
-        if (opts && opts.timeout) {
-            const $timeout = timer(opts.timeout);
-            wait$ = merge(wait$.pipe(takeUntil($timeout)), $timeout
-                .pipe(map(() => {
-                throw new Error(`Timeout waitIdle() - after ${opts.timeout}ms`);
-            })));
-        }
-        yield firstNotNilPromise(wait$);
+        yield firstNotNilPromise(wait$, opts);
     });
 }
 function waitForTrue(observable, opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Timeout (+ dueTime)
-        if (opts && opts.timeout > 0) {
-            const $timeout = timer(opts.timeout);
-            return merge(timer(opts.dueTime || 0)
-                .pipe(switchMap(() => firstTrue(observable)), takeUntil($timeout)), $timeout
-                .pipe(map(() => {
-                throw new Error(`Timeout ready() - after ${opts.timeout}ms`);
-            })))
-                .toPromise();
-        }
-        // dueTime (without timeout)
-        if (opts && opts.dueTime > 0) {
-            return timer(opts.dueTime)
-                .pipe(switchMap(() => firstTrue(observable)))
-                .toPromise();
-        }
-        return firstTrue(observable).toPromise();
-    });
+    opts = Object.assign({ stopError: true }, opts);
+    // dueTime (without timeout)
+    if (opts && opts.dueTime > 0) {
+        return timer(opts.dueTime)
+            .pipe(switchMap(() => firstTrue(observable, opts)))
+            .toPromise();
+    }
+    return firstTrue(observable, opts).toPromise();
 }
 function waitForFalse(observable, opts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return waitForTrue(
-        // Inverse the logic
-        observable.pipe(map(v => v === false)), opts);
-    });
+    return waitForTrue(
+    // Inverse the logic
+    observable.pipe(map(v => v === false)), opts);
 }
 
 function createPromiseEventEmitter() {
@@ -22355,13 +22341,12 @@ class EntitiesTableDataSource extends TableDataSource {
      * @param config Additional configuration for table.
      */
     constructor(dataType, dataService, validatorService, options) {
-        super([], dataType, validatorService, Object.assign({ keepOriginalDataAfterConfirm: false, readOnly: false, saveOnlyDirtyRows: false, dataServiceOptions: {} }, options));
+        super([], dataType, validatorService, Object.assign({ keepOriginalDataAfterConfirm: false, readOnly: false, saveOnlyDirtyRows: false }, options));
         this.dataService = dataService;
         this._debug = false;
         this._creating = false;
         this._saving = false;
         this._stopWatching$ = new Subject();
-        this._editingRowCount = 0;
         this._fetchMoreFn = null;
         this.loadingSubject = new BehaviorSubject(undefined);
         this._entityName = removeEnd((new dataType()).__typename || 'UnknownVO', 'VO');
@@ -22408,7 +22393,6 @@ class EntitiesTableDataSource extends TableDataSource {
     }
     watchAll(offset, size, sortBy, sortDirection, filter) {
         this._stopWatching$.next();
-        this._editingRowCount = 0;
         this._fetchMoreFn = null;
         this.markAsLoading();
         return this.dataService.watchAll(offset, size, sortBy, sortDirection, filter, this.serviceOptions)
@@ -22416,8 +22400,8 @@ class EntitiesTableDataSource extends TableDataSource {
             if (this._saving) {
                 console.info(`[table-datasource] Received ${this._entityName} data (from service), but still saving: skip`);
             }
-            else if (this._editingRowCount > 0) {
-                console.warn(`[table-datasource] Received ${this._entityName} data, while ${this._editingRowCount} rows still editing: skip; Please check save() implementation in the table!`);
+            else if (this.hasSomeEditingRow()) {
+                console.warn(`[table-datasource] Received ${this._entityName} data, while some row still editing: skip; Please check save() implementation in the table!`);
             }
             else {
                 this.updateDatasource((res.data || []));
@@ -22471,7 +22455,6 @@ class EntitiesTableDataSource extends TableDataSource {
                     // Stop with an error
                     throw { code: ErrorCodes.TABLE_INVALID_ROW_ERROR, message: 'ERROR.TABLE_INVALID_ROW_ERROR' };
                 }
-                this._editingRowCount = 0;
                 let data;
                 let dataToSave;
                 if (this.validatorService) {
@@ -22548,7 +22531,6 @@ class EntitiesTableDataSource extends TableDataSource {
             console.warn('[table-datasource] Row still has {editing: true} after confirmCreate()! Force editing to false');
             row.validator.disable({ onlySelf: true, emitEvent: false });
         }
-        this._editingRowCount--;
         return true;
     }
     confirmEdit(row) {
@@ -22558,7 +22540,6 @@ class EntitiesTableDataSource extends TableDataSource {
             console.warn('[table-datasource] Row still has {editing: true} after confirmEdit()! Force editing to false');
             row.validator.disable({ onlySelf: true, emitEvent: false });
         }
-        this._editingRowCount--;
         return true;
     }
     startEdit(row) {
@@ -22568,7 +22549,6 @@ class EntitiesTableDataSource extends TableDataSource {
             console.warn('[table-datasource] Row still has {editing: false} after startEdit()! Force editing');
             row.validator.enable({ onlySelf: true, emitEvent: false });
         }
-        this._editingRowCount++;
     }
     handleError(error, message) {
         const errorMsg = error && error.message || error;
@@ -22592,9 +22572,7 @@ class EntitiesTableDataSource extends TableDataSource {
             console.error(`[table-datasource] Row to delete with id=${id} not found`);
             return;
         }
-        if (row.editing)
-            this._editingRowCount--;
-        this.loadingSubject.next(true);
+        this.markAsLoading();
         this.dataService.deleteAll([row.currentData], this.serviceOptions)
             .catch(err => this.handleServiceError(err))
             .then(() => {
@@ -22603,7 +22581,7 @@ class EntitiesTableDataSource extends TableDataSource {
                 const present = this.getRow(id) === row;
                 if (present)
                     super.delete(id);
-                this.loadingSubject.next(false);
+                this.markAsLoaded();
             }, 300);
         });
     }
@@ -22620,7 +22598,13 @@ class EntitiesTableDataSource extends TableDataSource {
                 yield this.dataService.deleteAll(data, this.serviceOptions);
                 // Workaround, to be sure all rows have been deleted
                 // Sometimes, the service miss deletion, or GrapQHl cache remove failed
-                const rowNotDeleted = this.getRows().filter(row => rows.includes(row));
+                const rowNotDeleted = Object.getOwnPropertyNames(rowsById)
+                    .reduce((res, id) => {
+                    const row = rowsById[id];
+                    const present = this.getRow(+id) === row;
+                    return present ? res.concat(row) : res;
+                }, []);
+                //this.getRows().filter(row => rows.includes(row));
                 // Apply missing deletion
                 if (isNotEmptyArray(rowNotDeleted)) {
                     console.warn(`[table-datasource] Force deletion of ${rowNotDeleted.length} rows (Is service update the cache ?)`);
@@ -22631,7 +22615,7 @@ class EntitiesTableDataSource extends TableDataSource {
                 }
             }
             catch (err) {
-                // Handle sservice error
+                // Handle service error
                 this.handleServiceError(err);
             }
             finally {
@@ -22645,6 +22629,9 @@ class EntitiesTableDataSource extends TableDataSource {
     getRows() {
         return this.rowsSubject.getValue();
     }
+    hasSomeEditingRow() {
+        return (this.rowsSubject.value || []).some(row => row.editing);
+    }
     createNew(insertAt, options = { editing: true }) {
         const _super = Object.create(null, {
             createNew: { get: () => super.createNew }
@@ -22667,8 +22654,6 @@ class EntitiesTableDataSource extends TableDataSource {
                         console.error(err && err.message || err, err);
                     }
                 }
-                if (row.editing)
-                    this._editingRowCount++;
                 return row;
             }
             finally {
@@ -22687,8 +22672,8 @@ class EntitiesTableDataSource extends TableDataSource {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._fetchMoreFn)
                 return false; // Avoid multiple call
-            if (this._editingRowCount > 0) {
-                console.warn(`Cannot fetch more ${this._entityName} because ${this._editingRowCount} row(s) still editing`);
+            if (this.hasSomeEditingRow()) {
+                console.warn(`Cannot fetch more ${this._entityName} because some row) still editing`);
                 return;
             }
             console.debug(`Will fetching more row(s) still...`);
@@ -22760,7 +22745,6 @@ class AppTable {
         this.savingSubject = new BehaviorSubject(false);
         this.dirtySubject = new BehaviorSubject(false);
         this.errorSubject = new BehaviorSubject(undefined);
-        this.isRateLimitReached = false;
         this.selection = new SelectionModel(true, []);
         this.editedRow = undefined;
         this.i18nColumnPrefix = 'COMMON.';
@@ -23154,7 +23138,6 @@ class AppTable {
             if (!res)
                 return; // Skip (e.g error)
             if (res && res.data) {
-                this.isRateLimitReached = !this.paginator || (res.data.length < this.paginator.pageSize);
                 this.visibleRowCount = res.data.length;
                 this.totalRowCount = isNotNil(res.total) ? res.total : ((this.paginator && this.paginator.pageIndex * (this.paginator.pageSize || DEFAULT_PAGE_SIZE) || 0) + this.visibleRowCount);
                 if (this.debug)
@@ -23162,7 +23145,6 @@ class AppTable {
             }
             else {
                 //if (this.debug) console.debug('[table] NO rows loaded');
-                this.isRateLimitReached = true;
                 this.totalRowCount = 0;
                 this.visibleRowCount = 0;
             }
@@ -23284,6 +23266,7 @@ class AppTable {
         // Stop event
         event === null || event === void 0 ? void 0 : event.stopPropagation();
         // Confirmation edition or creation
+        //const confirmed = this.dataSource.confirmEditCreate(row);
         const confirmed = row.confirmEditCreate();
         if (confirmed) {
             // If edit finished, forget edited row
@@ -23514,22 +23497,19 @@ class AppTable {
             if (this.saveBeforeDelete) {
                 // Exclude invalid rows (because of save() will fail, when exists some invalid rows)
                 rows = rows.filter(row => {
-                    if (row.validator && !row.validator.valid) {
-                        // When deleted (= newly created row) : decrement counter
-                        if (row.id === -1 || !row.editing) {
-                            row.delete();
-                            this.visibleRowCount--;
-                            this.totalRowCount--;
-                            return false; // Remove this row to the list, because already deleted
-                        }
-                        // Mark row as pristine, to avoid row to be saved even if still invalid
-                        else {
-                            // Will cancel only (delete will always go into the previous 'if')
-                            row.cancelOrDelete();
-                            // Mark row as pristine (if possible)
-                            this.checkIfRowPristine(row, { emitEvent: false, onlySelf: true /*avoid propagation to table*/ });
-                            // Continue: the row will be deleted after the save
-                        }
+                    // Delete the row, if newly created row (id = -1), or if invalid and not editing (= not cancellable)
+                    if (row.id === -1 || (!row.valid && !row.editing)) {
+                        row.delete();
+                        this.visibleRowCount--;
+                        this.totalRowCount--;
+                        return false;
+                    }
+                    // Cancel the row (and mark as pristine), when not valid but in edition
+                    else if (!row.valid && row.editing) {
+                        row.cancel();
+                        // Mark row as pristine (if possible)
+                        this.checkIfRowPristine(row, { emitEvent: false, onlySelf: true /*avoid propagation to table*/ });
+                        return true; // Keep the row. the row will be deleted after the save
                     }
                     return true;
                 });