@sumaris-net/ngx-components 1.7.0 → 1.7.3

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

@@ -4758,11 +4758,8 @@
                 this.pattern = 'DDMM';
                 this.mask = MASKS[this.type][this.pattern];
             }
-            if (isNil(this.maxDecimals)) {
-                this.maxDecimals = DEFAULT_MAX_DECIMALS;
-            }
             // Remove max decimals in the DDMMSS format
-            else if (this.pattern === 'DD') {
+            if (this.pattern === 'DD') {
                 console.warn("Invalid attribute 'maxDecimals' - Must be '0' when using the 'DDMMSS' pattern.");
                 this.maxDecimals = 7;
             }
@@ -4770,12 +4767,15 @@
                 console.warn("Invalid attribute 'maxDecimals' - Must be '0' when using the 'DDMMSS' pattern.");
                 this.maxDecimals = 0;
             }
+            else if (isNil(this.maxDecimals)) {
+                this.maxDecimals = DEFAULT_MAX_DECIMALS;
+            }
             else if (this.maxDecimals < 0) {
                 console.error('Invalid attribute \'maxDecimals\'. Must a positive value.');
                 this.maxDecimals = DEFAULT_MAX_DECIMALS;
             }
             else if (this.maxDecimals !== DEFAULT_MAX_DECIMALS) {
-                console.warn("Invalid attribute 'maxDecimals' - Expected value: " + DEFAULT_MAX_DECIMALS + ". Other value not implemented.");
+                console.warn("Invalid attribute 'maxDecimals' - Expected value: " + DEFAULT_MAX_DECIMALS + " but get: " + this.maxDecimals + ". Other value not implemented.");
                 this.maxDecimals = DEFAULT_MAX_DECIMALS;
             }
             this.showSignControl = this.pattern !== 'DD';
@@ -25033,7 +25033,7 @@
             rxjs.merge(
             // Listen sort events
             this.sort && this.sort.sortChange
-                .pipe(operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_d) {
+                .pipe(operators.filter(function () { return !_this.sort.disabled; }), operators.mergeMap(function () { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_d) {
                 return [2 /*return*/, this.saveBeforeAction('sort')];
             }); }); }), operators.filter(function (res) { return res === true; }), 
             // Save sort in settings
@@ -25054,7 +25054,9 @@
             });
             // If the user changes the sort order, reset back to the first page.
             if (this.sort && this.paginator) {
-                this.registerSubscription(this.sort.sortChange.subscribe(function () { return _this.paginator.pageIndex = 0; }));
+                this.registerSubscription(this.sort.sortChange
+                    .pipe(operators.filter(function () { return !_this.sort.disabled; }))
+                    .subscribe(function () { return _this.paginator.pageIndex = 0; }));
             }
         };
         AppTable.prototype.ngOnDestroy = function () {
@@ -27280,7 +27282,7 @@
                         case 0:
                             if (!this.dataService)
                                 throw new Error('Cannot load data: missing \'dataService\'!');
-                            this.error = null;
+                            this.resetError();
                             if (!isNil(id)) return [3 /*break*/, 7];
                             _b.label = 1;
                         case 1:
@@ -27296,7 +27298,7 @@
                             return [3 /*break*/, 6];
                         case 4:
                             err_1 = _b.sent();
-                            this.setError(err_1);
+                            this.setError(err_1, { emitEvent: false });
                             this.selectedTabIndex = 0;
                             return [3 /*break*/, 6];
                         case 5:
@@ -27528,7 +27530,7 @@
                                 return [2 /*return*/, false];
                             }
                             this.markAsSaving();
-                            this.error = undefined;
+                            this.resetError();
                             if (this.debug)
                                 console.debug('[data-editor] Saving data...');
                             _b.label = 2;
@@ -27630,7 +27632,7 @@
                                 return [2 /*return*/];
                             console.debug('[data-editor] Asking to delete...');
                             this.markAsSaving();
-                            this.error = undefined;
+                            this.resetError();
                             _b.label = 2;
                         case 2:
                             _b.trys.push([2, 7, , 8]);
@@ -27702,17 +27704,35 @@
                 });
             });
         };
-        AppEntityEditor.prototype.setError = function (err) {
-            console.error('[entity-editor] Error: ' + err && err.message || '', err);
-            var userMessage = err && err.message && this.translate.instant(err.message) || err;
-            // Add details error (if any) under the main message
-            var detailMessage = err && err.details && (err.details.message || err.details) || undefined;
-            if (isNotNilString(detailMessage)) {
-                userMessage += "<br/><small class=\"hidden-xs hidden-sm\" title=\"" + detailMessage + "\">";
-                userMessage += detailMessage.length < 70 ? detailMessage : detailMessage.substring(0, 67) + '...';
-                userMessage += '</small>';
+        AppEntityEditor.prototype.resetError = function (opts) {
+            if (isNotNilOrBlank(this.error)) {
+                this.error = null;
+                if (!opts || opts.emitEvent !== false)
+                    this.markForCheck();
+            }
+        };
+        AppEntityEditor.prototype.setError = function (err, opts) {
+            if (!err || typeof err === 'string') {
+                console.error('[entity-editor] Error: ' + (err || ''));
+                this.error = err;
             }
-            this.error = userMessage;
+            else {
+                console.error('[entity-editor] Error: ' + err.message || '', err);
+                var userMessage = err.message && this.translate.instant(err.message) || err;
+                // Add details error (if any) under the main message
+                var detailMessage = (!err.details || typeof err.details === 'string')
+                    ? err.details
+                    : err.details.message;
+                if (isNotNilOrBlank(detailMessage)) {
+                    var cssClass = (opts === null || opts === void 0 ? void 0 : opts.detailsCssClass) || 'hidden-xs hidden-sm';
+                    userMessage += "<br/><small class=\"" + cssClass + "\" title=\"" + detailMessage + "\">";
+                    userMessage += detailMessage.length < 70 ? detailMessage : detailMessage.substring(0, 67) + '...';
+                    userMessage += '</small>';
+                }
+                this.error = userMessage;
+            }
+            if (!opts || opts.emitEvent !== false)
+                this.markForCheck();
         };
         /* -- protected methods -- */
         /**