@sumaris-net/ngx-components 1.23.47 → 1.23.49

package/bundles/sumaris-net.ngx-components.umd.js

@@ -1142,7 +1142,7 @@
         return new i0.EventEmitter(true);
     }
     function createPromiseEvent(eventType, promise, initArg) {
-        var detail = Object.assign(Object.assign({}, (initArg && initArg.detail || {})), promise);
+        var detail = Object.assign(Object.assign({}, ((initArg === null || initArg === void 0 ? void 0 : initArg.detail) || {})), promise);
         return new CustomEvent(eventType, { detail: detail });
     }
     function emitPromiseEvent(emitter, eventType, initArg) {
@@ -21126,8 +21126,10 @@
                 return __generator(this, function (_c) {
                     if (this.debug)
                         console.debug('[memory-data-service] Stopping...');
-                    this.dataSubject.complete();
-                    this.dataSubject.unsubscribe();
+                    if (!this.dataSubject.closed) {
+                        this.dataSubject.complete();
+                        this.dataSubject.unsubscribe();
+                    }
                     this._hiddenData = null;
                     this.markAsSaved();
                     this.markAsPristine();
@@ -21279,10 +21281,10 @@
             offset = offset >= 0 ? offset : 0;
             size = size >= 0 ? size : -1;
             return this.dataSubject
-                .pipe(operators.takeUntil(this.stopSubject), 
+                .pipe(
             // Warn if waiting value to be set
-            operators.tap(function (data) { return _this.debug && !data && console.debug('[memory-data-service] Waiting value to be set...'); }), operators.filter(isNotNil), operators.mergeMap(function (_) { return _this.loadAll(offset, size, sortBy, sortDirection, filterData, options); }), operators.filter(isNotNil) // Skip no result (e.g. when stopped)
-            );
+            operators.tap(function (data) { return _this.debug && !data && console.debug('[memory-data-service] Waiting value to be set...'); }), operators.filter(isNotNil), operators.mergeMap(function (_) { return _this.loadAll(offset, size, sortBy, sortDirection, filterData, options); }), operators.filter(isNotNil), // Skip no result (e.g. when stopped)
+            operators.takeUntil(this.stopSubject));
         };
         InMemoryEntitiesService.prototype.saveAll = function (data, options) {
             return __awaiter(this, void 0, void 0, function () {
@@ -27146,7 +27148,7 @@
             }
         };
         AppTable.prototype.confirmAndAdd = function (event, row) {
-            if (!this.confirmEditCreate(event, row)) {
+            if (row && !this.confirmEditCreate(event, row)) {
                 return false;
             }
             // Add row
@@ -27252,22 +27254,31 @@
             }
         };
         AppTable.prototype.addRow = function (event, insertAt, opts) {
-            if (this.debug)
-                console.debug('[table] Asking for new row...');
-            if (!this._enabled)
-                return false;
-            // Use modal if inline edition is disabled
-            if (!this.inlineEdition) {
-                this.openNewRowDetail(event);
-                return false;
-            }
-            // Try to finish edited row first
-            if (!this.confirmEditCreate()) {
-                return false;
-            }
-            // Add new row
-            this.addRowToTable(insertAt, opts);
-            return true;
+            return __awaiter(this, void 0, void 0, function () {
+                var row;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            if (this.debug)
+                                console.debug('[table] Asking for new row...');
+                            if (!this._enabled)
+                                return [2 /*return*/, false];
+                            // Use modal if inline edition is disabled
+                            if (!this.inlineEdition) {
+                                this.openNewRowDetail(event);
+                                return [2 /*return*/, false];
+                            }
+                            // Try to finish edited row first
+                            if (!this.confirmEditCreate()) {
+                                return [2 /*return*/, false];
+                            }
+                            return [4 /*yield*/, this.addRowToTable(insertAt, opts)];
+                        case 1:
+                            row = _e.sent();
+                            return [2 /*return*/, !!row];
+                    }
+                });
+            });
         };
         AppTable.prototype.save = function (opts) {
             var _a, _b, _c, _d;
@@ -27347,6 +27358,8 @@
                             return [4 /*yield*/, this.addRowToTable(row.id + 1)];
                         case 1:
                             newRow = _e.sent();
+                            if (!newRow)
+                                throw new Error('Cannot add new row to table');
                             json = Object.assign(Object.assign({}, row.currentData), { id: null });
                             // Reset some properties (e.g. rankOrder, etc)
                             if (opts && opts.skipProperties) {
@@ -27592,6 +27605,7 @@
                     event.preventDefault();
                 }
                 this.markAsLoading();
+                this.selection.clear();
                 this.openRow(row.currentData.id, row)
                     .then(function () { return _this.markAsLoaded(); })
                     .catch(function () { return _this.markAsLoaded(); });
@@ -28066,7 +28080,13 @@
                 var row;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
-                        case 0: return [4 /*yield*/, this._dataSource.createNew(insertAt, Object.assign({ editing: true }, opts))];
+                        case 0:
+                            // Try to finish edited row first
+                            if (!this.confirmEditCreate()) {
+                                console.warn('[table] Cannot add new row, because the previous edited row cannot be confirmed');
+                                return [2 /*return*/, undefined];
+                            }
+                            return [4 /*yield*/, this._dataSource.createNew(insertAt, { editing: opts === null || opts === void 0 ? void 0 : opts.editing })];
                         case 1:
                             row = _e.sent();
                             if (!row)
@@ -32900,6 +32920,15 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(UsersPage.prototype, "firstUserColumn", {
+            get: function () {
+                var columnName = this.displayedColumns[RESERVED_START_COLUMNS.length];
+                // Skip avatar column, if present
+                return columnName === 'avatar' && this.displayedColumns[RESERVED_START_COLUMNS.length + 1] || columnName;
+            },
+            enumerable: false,
+            configurable: true
+        });
         UsersPage.prototype.ngOnInit = function () {
             var _this = this;
             _super.prototype.ngOnInit.call(this);