@sumaris-net/ngx-components 1.10.0 → 1.10.3

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

@@ -10672,11 +10672,11 @@
         },
         account: {
             enableListenChanges: true,
-            listenIntervalInSeconds: 30
+            listenIntervalInSeconds: 60
         },
         entityEditor: {
             enableListenChanges: true,
-            listenIntervalInSeconds: 30
+            listenIntervalInSeconds: 60
         }
     });
 
@@ -15465,7 +15465,8 @@
             };
             _this._$additionalFields = new rxjs.BehaviorSubject([]);
             _this._tokenType$ = new rxjs.BehaviorSubject(undefined);
-            _this._enableListenChanges = (!environment.account || environment.account.enableListenChanges !== false);
+            _this._enableListenChanges = (!environment.account || environment.account.enableListenChanges !== false); // True by default
+            _this._listenIntervalInSeconds = toNumber(environment.account && environment.account.listenIntervalInSeconds, 0); // no timer by default
             _this._debug = !environment.production;
             if (_this._debug)
                 console.debug('[account-service] Creating service');
@@ -15711,7 +15712,7 @@
                             this.onChange.next(this._data);
                             // Listen remote changes
                             if (this._enableListenChanges)
-                                this.startListenChanges();
+                                this.startListenRemoteChanges();
                             return [2 /*return*/, this._data];
                         case 6:
                             error_1 = _b.sent();
@@ -15867,7 +15868,7 @@
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
                             if (this._enableListenChanges)
-                                this.startListenChanges();
+                                this.startListenRemoteChanges();
                             return [2 /*return*/, this._data];
                     }
                 });
@@ -16007,7 +16008,6 @@
                             if (hadAuthBasic)
                                 this.onAuthBasicChange.next(undefined);
                             this.onChange.next(undefined);
-                            this.stopListenChanges();
                             return [2 /*return*/];
                     }
                 });
@@ -16170,7 +16170,7 @@
         AccountService.prototype.listenChanges = function (opts) {
             if (this._enableListenChanges)
                 return new rxjs.Subscription(); // Already started: skip
-            return this.startListenChanges(opts);
+            return this.startListenRemoteChanges(opts);
         };
         Object.defineProperty(AccountService.prototype, "additionalFields", {
             get: function () {
@@ -16200,7 +16200,7 @@
         };
         /* -- protected method -- */
         AccountService.prototype.resetData = function () {
-            this.stopListenChanges();
+            this.stopListenRemoteChanges();
             this._cache.loaded = false;
             this._cache.keypair = null;
             this._cache.authToken = null;
@@ -16352,7 +16352,7 @@
                             this.onLogin.next(this._data);
                             this.onChange.next(this._data);
                             if (this._enableListenChanges)
-                                this.startListenChanges();
+                                this.startListenRemoteChanges();
                             if (this._debug)
                                 console.debug("[account] Account restoration [OK] {pubkey: " + pubkey.substr(0, 8) + "}, {profile: " + this._cache.mainProfile + "}");
                             return [2 /*return*/, account];
@@ -16602,13 +16602,13 @@
                 });
             });
         };
-        AccountService.prototype.startListenChanges = function (opts) {
+        AccountService.prototype.startListenRemoteChanges = function (opts) {
             var _this = this;
             if (this._listenChangesSubscription)
-                this.stopListenChanges(); // Stop previous subscription
+                this.stopListenRemoteChanges(); // Stop previous subscription
             if (this.network.offline)
                 return new rxjs.Subscription(); // Offline: skip
-            var subscription = this.watchChanges(opts)
+            this._listenChangesSubscription = this.watchChanges(opts)
                 .subscribe({
                 next: function (data) {
                     console.debug("[account] Remote update detected at " + data.updateDate);
@@ -16628,21 +16628,18 @@
                     }
                 }
             });
-            // Add close log
-            subscription.add(function () { return console.debug("[account] Stop watching remote changes"); });
-            this._listenChangesSubscription = subscription;
-            // Make sure to use the stop function, when unsubscribe
-            return new rxjs.Subscription(function () { return _this.stopListenChanges(); });
+            this._listenChangesSubscription.add(function () {
+                console.debug("[account] Stop watching remote changes");
+                _this._listenChangesSubscription = null;
+            });
+            return this._listenChangesSubscription;
         };
-        AccountService.prototype.stopListenChanges = function () {
-            if (this._listenChangesSubscription) {
-                this._listenChangesSubscription.unsubscribe();
-                this._listenChangesSubscription = null;
-            }
+        AccountService.prototype.stopListenRemoteChanges = function () {
+            var _a;
+            (_a = this._listenChangesSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
         };
         AccountService.prototype.watchChanges = function (opts) {
             var _this = this;
-            var _a;
             if (!this.started) {
                 // Wait service ready, then loop
                 return rxjs.from(this.ready())
@@ -16653,7 +16650,7 @@
             if (this.network.offline)
                 throw new Error('Cannot watch account changes: network is offline.');
             var variables = {
-                interval: Math.max(0, (opts === null || opts === void 0 ? void 0 : opts.intervalInSeconds) || ((_a = this.environment.account) === null || _a === void 0 ? void 0 : _a.listenIntervalInSeconds) || 0)
+                interval: toNumber(opts && opts.intervalInSeconds, this._listenIntervalInSeconds)
             };
             console.debug("[account] Watching remote changes, every " + variables.interval + "s");
             return this.graphql.subscribe({
@@ -23629,11 +23626,14 @@
     var CoreModule = /** @class */ (function () {
         function CoreModule() {
         }
-        CoreModule.forRoot = function () {
+        CoreModule.forRoot = function (environment) {
             console.info('[core] Creating module (root)');
             return {
                 ngModule: CoreModule,
-                providers: [PlatformService]
+                providers: [
+                    PlatformService,
+                    { provide: ENVIRONMENT, useValue: environment }
+                ]
             };
         };
         return CoreModule;
@@ -24222,7 +24222,7 @@
                 throw Error('Not implemented!');
             var variables = opts && opts.variables || {
                 id: id,
-                interval: opts && opts.interval || 10 // seconds
+                interval: toNumber(opts && opts.interval, 0) // no timer by default
             };
             if (this._debug)
                 console.debug(this._logPrefix + ("[WS] Listening for changes on " + this._logTypeName + " {" + id + "}..."));
@@ -25622,7 +25622,7 @@
         AppTable.prototype.deleteRows = function (event, rows, opts) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var confirmed, canDelete, saved, rowsToDelete, deleteCount, err_2;
+                var confirmed, canDelete, saved, deleteCount, err_2;
                 var _this = this;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
@@ -25658,13 +25658,16 @@
                                     if (deleted) {
                                         _this.visibleRowCount--;
                                         _this.totalRowCount--;
+                                        // Forget is was the edited row
+                                        if (row === _this.editedRow) {
+                                            _this.editedRow = undefined;
+                                        }
                                         return res;
                                     }
                                 }
                                 return res.concat(row);
                             }, []);
-                            if (isEmptyArray(rows))
-                                return [2 /*return*/, 0];
+                            if (!isNotEmptyArray(rows)) return [3 /*break*/, 3];
                             return [4 /*yield*/, this.saveBeforeAction('delete')];
                         case 2:
                             saved = _e.sent();
@@ -25674,20 +25677,21 @@
                             }
                             _e.label = 3;
                         case 3:
+                            _e.trys.push([3, 6, , 7]);
+                            deleteCount = rows.length;
+                            if (!deleteCount) return [3 /*break*/, 5];
                             if (this.debug)
-                                console.debug('[table] Delete selection...');
-                            rowsToDelete = rows.slice()
-                                // Reverse row order
-                                // This is a workaround, need because row.delete() has async execution
-                                // and index cache is updated with a delay)
+                                console.debug('[table] Delete selected rows...');
+                            // Reverse row order (on a copy)
+                            // This is a workaround, need because row.delete() has async execution
+                            // and index cache is updated with a delay
+                            rows = rows.slice()
                                 .sort(function (a, b) { return a.id > b.id ? -1 : 1; });
-                            _e.label = 4;
+                            return [4 /*yield*/, this._dataSource.deleteAll(rows)];
                         case 4:
-                            _e.trys.push([4, 6, , 7]);
-                            deleteCount = rowsToDelete.length;
-                            return [4 /*yield*/, this._dataSource.deleteAll(rowsToDelete)];
-                        case 5:
                             _e.sent();
+                            _e.label = 5;
+                        case 5:
                             // DO not update manually, because watchALl().subscribe() will update this count
                             //this.totalRowCount -= deleteCount;
                             //this.visibleRowCount -= deleteCount;
@@ -25695,7 +25699,8 @@
                             this.editedRow = undefined;
                             this.markAsDirty({ emitEvent: false /*markForCheck() is called just after*/ });
                             this.markForCheck();
-                            this.onAfterDeletedRows.next(rowsToDelete);
+                            if (deleteCount)
+                                this.onAfterDeletedRows.next(rows);
                             return [2 /*return*/, deleteCount];
                         case 6:
                             err_2 = _e.sent();
@@ -27294,17 +27299,16 @@
     var AppEntityEditor = /** @class */ (function (_super) {
         __extends(AppEntityEditor, _super);
         function AppEntityEditor(injector, dataType, dataService, options) {
-            var _this = this;
-            var _a;
-            _this = _super.call(this, injector.get(i3.ActivatedRoute), injector.get(i3.Router), injector.get(i1$5.AlertController), injector.get(i1$2.TranslateService), options) || this;
+            var _this = _super.call(this, injector.get(i3.ActivatedRoute), injector.get(i3.Router), injector.get(i1$5.AlertController), injector.get(i1$2.TranslateService), options) || this;
             _this.dataType = dataType;
             _this.dataService = dataService;
             _this.saving = false;
             _this.$title = new rxjs.Subject();
             _this.onUpdateView = new i0.EventEmitter();
+            _this.environement = injector.get(ENVIRONMENT);
             options = Object.assign({
                 // Default options
-                enableListenChanges: (((_a = injector.get(ENVIRONMENT).entityEditor) === null || _a === void 0 ? void 0 : _a.enableListenChanges) === true), pathIdAttribute: 'id', autoLoad: true, autoUpdateRoute: true, i18nPrefix: ''
+                enableListenChanges: !_this.environement.entityEditor || _this.environement.entityEditor.enableListenChanges !== false, listenIntervalInSeconds: toNumber(_this.environement.entityEditor && _this.environement.entityEditor.listenIntervalInSeconds, 0), pathIdAttribute: 'id', autoLoad: true, autoUpdateRoute: true, i18nPrefix: ''
             }, options);
             _this.settings = injector.get(LocalSettingsService);
             _this.errorTranslator = injector.get(FormErrorTranslator);
@@ -27312,6 +27316,7 @@
             _this.dateFormat = injector.get(DateFormatPipe);
             _this.toastController = injector.get(i1$5.ToastController);
             _this._enableListenChanges = options.enableListenChanges;
+            _this._listenIntervalInSeconds = options.listenIntervalInSeconds;
             _this._pathIdAttribute = options.pathIdAttribute;
             _this._autoLoad = options.autoLoad;
             _this._autoLoadDelay = options.autoLoadDelay;
@@ -27401,7 +27406,7 @@
         };
         AppEntityEditor.prototype.ngOnDestroy = function () {
             _super.prototype.ngOnDestroy.call(this);
-            this.listenRemoteSubscription = null; // already unsubscribe in the super function
+            this._listenChangesSubscription = null; // already unsubscribe in the super function
             this.$title.complete();
             this.$title.unsubscribe();
             this.onUpdateView.complete();
@@ -27498,32 +27503,33 @@
         AppEntityEditor.prototype.startListenRemoteChanges = function () {
             var _this = this;
             // Skip if disable, or already listening
-            if (this.listenRemoteSubscription || !this._enableListenChanges || this.isNewData)
+            if (this._listenChangesSubscription || !this._enableListenChanges || this.isNewData)
                 return;
             // Listen for changes on server
-            this.listenRemoteSubscription = this.dataService.listenChanges(this.data.id)
+            this._listenChangesSubscription = this.dataService.listenChanges(this.data.id, { interval: this._listenIntervalInSeconds })
                 .pipe(operators.filter(isNotNil))
                 .subscribe(function (data) {
                 if (data.updateDate && data.updateDate.isAfter(_this.data.updateDate)) {
                     if (!_this.dirty) {
                         if (_this.debug)
-                            console.debug("[data-editor] Changes detected on server, at {" + data.updateDate + "} : reloading page...");
+                            console.debug("[data-editor] Changes detected on server, at {" + data.updateDate + "}: reloading page...");
                         _this.updateView(data);
                     }
                     else {
                         if (_this.debug)
                             console.debug("[data-editor] Changes detected on server, at {" + data.updateDate + "}, but page is dirty: skip reloading.");
+                        // TODO: alter user (with a toast ?)
                     }
                 }
             });
-            this.listenRemoteSubscription.add(function () { return _this.listenRemoteSubscription = null; });
-            this.registerSubscription(this.listenRemoteSubscription);
+            this._listenChangesSubscription.add(function () { return _this._listenChangesSubscription = null; });
+            this.registerSubscription(this._listenChangesSubscription);
         };
         AppEntityEditor.prototype.stopListenRemoteChanges = function () {
-            if (this.listenRemoteSubscription) {
-                this.unregisterSubscription(this.listenRemoteSubscription);
-                this.listenRemoteSubscription.unsubscribe();
-                this.listenRemoteSubscription = null;
+            if (this._listenChangesSubscription) {
+                this.unregisterSubscription(this._listenChangesSubscription);
+                this._listenChangesSubscription.unsubscribe();
+                this._listenChangesSubscription = null;
             }
         };
         AppEntityEditor.prototype.updateView = function (data, opts) {
@@ -27720,7 +27726,7 @@
                             // Update the view (e.g metadata)
                             _b.sent();
                             // Subscribe to remote changes
-                            if (!this.listenRemoteSubscription)
+                            if (!this._listenChangesSubscription)
                                 this.startListenRemoteChanges();
                             this.submitted = false;
                             return [2 /*return*/, true];