@sumaris-net/ngx-components 0.18.8 → 0.18.12

package/fesm2015/ngx-sumaris-components.js

@@ -10616,6 +10616,7 @@ const StatusList = Object.freeze([
         label: 'REFERENTIAL.STATUS_ENUM.TEMPORARY'
     }
 ]);
+const StatusById = Object.freeze(splitById(StatusList));
 //@dynamic
 class BaseReferential extends Entity {
     constructor(__typename) {
@@ -14240,7 +14241,6 @@ class InMemoryEntitiesService extends EntitiesService {
             // Detect rankOrder on the entity class
             id: (Object.getOwnPropertyNames(new dataType()).findIndex(key => key === 'rankOrder') !== -1) ? 'rankOrder' : undefined }, options.sortByReplacement);
     }
-    // TODO add test  see sub-batches.modal.ts onLoadData & _hiddenData
     set value(data) {
         this.setValue(data);
     }
@@ -14272,61 +14272,67 @@ class InMemoryEntitiesService extends EntitiesService {
         }
         return this._onChange
             .pipe(filter(isNotNil), mergeMap((_) => __awaiter(this, void 0, void 0, function* () {
-            this._hiddenData = [];
-            if (isEmptyArray(this.data)) {
-                return { data: [], total: 0 };
-            }
-            // Apply sort
-            let data = this._sortFn(this.data || [], sortBy, sortDirection);
-            if (this._onLoad) {
-                const promiseOrData = this._onLoad(data);
-                data = ((promiseOrData instanceof Promise)) ? yield promiseOrData : promiseOrData;
-            }
-            // Apply filter (will update hiddenData)
-            data = this.filter(data, filterData, this._hiddenData);
-            // Compute the total length
-            const total = data.length;
-            // If page size=0 (e.g. only need total)
-            if (size === 0) {
-                this._hiddenData.push(...data);
-                return { data: [], total };
-            }
-            // Slice in a page (using offset and size)
-            if (offset > 0) {
-                // Offset after the end: no result
-                if (offset >= data.length) {
-                    this._hiddenData.push(...data);
-                    data = [];
+            const excludedDataByFilter = [];
+            let excludedDataByPagination;
+            try {
+                if (isEmptyArray(this.data)) {
+                    return { data: [], total: 0 };
                 }
-                else {
-                    const hiddenData = (size > 0 && ((offset + size) < data.length)) ?
-                        // Slice using limit to size
-                        data.slice(0, offset - 1).concat(data.slice(offset + size)) :
-                        // Slice without limit
-                        data.slice(0, offset - 1);
-                    this._hiddenData.push(...hiddenData);
-                    data = (size > 0 && ((offset + size) < data.length)) ?
-                        // Slice using limit to size
-                        data.slice(offset, offset + size) :
-                        // Slice without limit
-                        data.slice(offset);
+                // Apply sort
+                let data = this._sortFn(this.data || [], sortBy, sortDirection);
+                if (this._onLoad) {
+                    const promiseOrData = this._onLoad(data);
+                    data = ((promiseOrData instanceof Promise)) ? yield promiseOrData : promiseOrData;
                 }
+                // Apply filter (will update hiddenData)
+                data = this.filter(data, filterData, excludedDataByFilter);
+                // Compute the total length
+                const total = data.length;
+                // If page size=0 (e.g. only need total)
+                if (size === 0) {
+                    excludedDataByPagination = data;
+                    return { data: [], total };
+                }
+                // Slice in a page (using offset and size)
+                if (offset > 0) {
+                    // Offset after the end: no result
+                    if (offset >= data.length) {
+                        excludedDataByPagination = data;
+                        data = [];
+                    }
+                    else {
+                        excludedDataByPagination = (size > 0 && ((offset + size) < data.length)) ?
+                            // Slice using limit to size
+                            data.slice(0, offset - 1).concat(data.slice(offset + size)) :
+                            // Slice without limit
+                            data.slice(0, offset - 1);
+                        data = (size > 0 && ((offset + size) < data.length)) ?
+                            // Slice using limit to size
+                            data.slice(offset, offset + size) :
+                            // Slice without limit
+                            data.slice(offset);
+                    }
+                }
+                // Apply a limit
+                else if (size > 0) {
+                    excludedDataByPagination = data.slice(size);
+                    data = data.slice(0, size);
+                }
+                // No limit:
+                else if (size === -1) {
+                    // Keep all data
+                }
+                // /!\ If already observed, then always create a copy of the original array
+                // Because datasource will only update if the array changed
+                if (data === this.data) {
+                    data = data.slice(0);
+                }
+                return { data, total };
             }
-            // Apply a limit
-            else if (size > 0) {
-                this._hiddenData.push(...data.slice(size));
-                data = data.slice(0, size);
-            }
-            // No limit:
-            else if (size === -1) {
-                // Keep all data
-            }
-            // /!\ If already observed, then always create a copy of the original array
-            // Because datasource will only update if the array changed
-            if (data === this.data) {
-                data = data.slice(0);
+            finally {
+                // Remember hidden data
+                this._hiddenData = [...excludedDataByFilter, ...excludedDataByPagination];
             }
-            return { data, total };
         })));
     }
     saveAll(data, options) {
@@ -14349,10 +14355,12 @@ class InMemoryEntitiesService extends EntitiesService {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.data)
                 throw new Error('[memory-service] Could not delete, because value not set');
+            if (!this._equalsFn)
+                throw new Error(`[memory-service] Could not delete, because no 'options.equals' has been set in the memory service`);
             // Remove deleted item, from data
             const updatedData = this.data.filter(entity => {
-                const shouldRemoved = dataToRemove.findIndex(entityToRemove => this._equalsFn(entityToRemove, entity)) !== -1;
-                return !shouldRemoved;
+                const removed = dataToRemove.findIndex(entityToRemove => this._equalsFn(entityToRemove, entity)) !== -1;
+                return !removed;
             });
             const deleteCount = this.data.length - updatedData.length;
             if (deleteCount > 0) {
@@ -15762,7 +15770,7 @@ function markAsUntouched(form, opts) {
     });
 }
 /**
- * Wait end of async validation
+ * Wait end of async validation (not pending)
  * return false
  */
 function waitWhilePending(form, opts) {
@@ -15775,7 +15783,7 @@ function waitWhilePending(form, opts) {
  * @param opts
  */
 function waitIdle(form, opts) {
-    const predicate = () => form.loading !== false;
+    const predicate = () => form.loading !== true;
     return waitFor(predicate, opts);
 }
 function isControlHasInput(controls, controlName) {
@@ -22436,9 +22444,6 @@ AppEntityEditor.ctorParameters = () => [
 // @dynamic
 // eslint-disable-next-line @angular-eslint/directive-class-suffix
 class AppInMemoryTable extends AppTable {
-    /* get dirty(): boolean {
-       return this._dirty || this.memoryDataService.dirty;
-     }*/
     constructor(injector, columns, dataType, memoryDataService, validatorService, options, filter) {
         super(injector.get(ActivatedRoute), injector.get(Router), injector.get(Platform), injector.get(Location), injector.get(ModalController), injector.get(LocalSettingsService), columns, new EntitiesTableDataSource(dataType, memoryDataService, validatorService, options), filter, injector);
         this.injector = injector;
@@ -22465,10 +22470,8 @@ class AppInMemoryTable extends AppTable {
             this.setError(null);
             this.markForCheck();
         }
-        const firstCall = isEmptyArray(this.memoryDataService.value);
-        const emitRefreshEvent = firstCall || (opts && opts.emitEvent !== false);
-        this.memoryDataService.setValue(value, { emitEvent: !firstCall && !emitRefreshEvent });
-        if (emitRefreshEvent) {
+        this.memoryDataService.value = value;
+        if (!opts || opts.emitEvent !== false) {
             this.onRefresh.emit();
         }
     }
@@ -23345,9 +23348,9 @@ class UsersPage extends AppTable {
         this.cd = cd;
         this.canEdit = false;
         this.profiles = [...PRIORITIZED_AUTHORITIES].reverse();
-        this.statusList = StatusList;
-        this.statusById = splitById(StatusList);
         this.filterCriteriaCount = 0;
+        this.statusList = StatusList;
+        this.statusById = StatusById;
         this.referentialToString = referentialToString;
         this.inlineEdition = accountService.isAdmin(); // Allow inline edition only if admin
         this.canEdit = accountService.isAdmin();