@sumaris-net/ngx-components 1.19.21 → 1.19.24

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

@@ -28381,7 +28381,7 @@
                             idChanged = isNotNil(data.id)
                                 && this.previousDataId !== undefined // Ignore if first loading (=undefined)
                                 && this.previousDataId !== data.id;
-                            opts = Object.assign({ updateRoute: this._autoUpdateRoute && idChanged && !this.loading, openTabIndex: this._autoOpenNextTab && idChanged && isNil(this.previousDataId) && this.computeNextTabIndex() }, opts);
+                            opts = Object.assign({ updateRoute: this._autoUpdateRoute && idChanged && !this.loading }, opts);
                             this.data = data;
                             this.previousDataId = data.id || null;
                             return [4 /*yield*/, this.ready()];
@@ -28435,7 +28435,7 @@
          */
         AppEntityEditor.prototype.updateTabAndRoute = function (data, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var forcedQueryParams;
+                var queryParams, queryParams;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -28444,20 +28444,27 @@
                             this.updateTabIndex(opts && opts.openTabIndex);
                             // Save the opened tab into the queryParams
                             this.queryParams.tab = this.selectedTabIndex;
-                            forcedQueryParams = {};
-                            forcedQueryParams[this._pathIdAttribute] = data && isNotNil(data.id) ? data.id : 'new';
-                            if (!(data && isNotNil(data.id))) return [3 /*break*/, 2];
+                            if (!isNotNil(data === null || data === void 0 ? void 0 : data.id)) return [3 /*break*/, 2];
+                            queryParams = Object.assign({}, this.queryParams);
+                            queryParams[this._pathIdAttribute] = data.id;
+                            if (this.debug)
+                                console.debug('[entity-editor] Updating route using params: ', queryParams);
                             return [4 /*yield*/, this.router.navigate(['.'], {
                                     relativeTo: this.route,
-                                    queryParams: Object.assign(Object.assign({}, this.queryParams), forcedQueryParams)
+                                    queryParams: queryParams
                                 })];
                         case 1:
                             _c.sent();
                             return [3 /*break*/, 4];
-                        case 2: return [4 /*yield*/, this.router.navigate(['..', 'new'], {
-                                relativeTo: this.route,
-                                queryParams: Object.assign(Object.assign({}, this.queryParams), forcedQueryParams)
-                            })];
+                        case 2:
+                            queryParams = Object.assign({}, this.queryParams);
+                            queryParams[this._pathIdAttribute] = 'new';
+                            if (this.debug)
+                                console.debug('[entity-editor] Updating route to \'../new\' using params: ', queryParams);
+                            return [4 /*yield*/, this.router.navigate(['..', 'new'], {
+                                    relativeTo: this.route,
+                                    queryParams: queryParams
+                                })];
                         case 3:
                             _c.sent();
                             _c.label = 4;
@@ -28473,7 +28480,7 @@
          * Update the route location, and open the next tab
          */
         AppEntityEditor.prototype.updateTabIndex = function (tabIndex) {
-            if (isNotNil(tabIndex) && tabIndex > this.selectedTabIndex) {
+            if (isNotNil(tabIndex) && tabIndex !== this.selectedTabIndex) {
                 this.selectedTabIndex = tabIndex;
                 this.markForCheck();
             }
@@ -28517,7 +28524,7 @@
          */
         AppEntityEditor.prototype.save = function (event, opts) {
             return __awaiter(this, void 0, void 0, function () {
-                var data, updatedData, err_3;
+                var nextTabIndex, data, updatedData, err_3;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
@@ -28549,6 +28556,7 @@
                             _c.label = 2;
                         case 2:
                             _c.trys.push([2, 7, 8, 9]);
+                            nextTabIndex = this._autoOpenNextTab && isNil(this.previousDataId) && this.computeNextTabIndex();
                             return [4 /*yield*/, this.getValue()];
                         case 3:
                             data = _c.sent();
@@ -28560,7 +28568,10 @@
                         case 5:
                             _c.sent();
                             // Update the view (e.g metadata)
-                            return [4 /*yield*/, this.updateView(updatedData, opts)];
+                            return [4 /*yield*/, this.updateView(updatedData, Object.assign({
+                                    // Open next tab only if user has not changed it
+                                    openTabIndex: nextTabIndex > this._selectedTabIndex ? nextTabIndex : undefined
+                                }, opts))];
                         case 6:
                             // Update the view (e.g metadata)
                             _c.sent();
@@ -28852,7 +28863,9 @@
                             return [4 /*yield*/, this.computePageHistory(title)];
                         case 2:
                             page = _c.sent();
-                            return [2 /*return*/, this.addToPageHistory(page)];
+                            if (page)
+                                return [2 /*return*/, this.addToPageHistory(page)];
+                            _c.label = 3;
                         case 3: return [2 /*return*/];
                     }
                 });
@@ -28870,6 +28883,8 @@
         AppEntityEditor.prototype.computePageHistory = function (title) {
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_c) {
+                    if (this.debug)
+                        console.debug('[entity-editor] Computing page history, using url: ' + this.router.url);
                     return [2 /*return*/, {
                             title: title,
                             path: this.router.url