@sumaris-net/ngx-components 0.28.2 → 0.28.3

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

@@ -19139,7 +19139,7 @@
             this.error = null;
             this._enable = false;
             this._$ready = new rxjs.BehaviorSubject(false);
-            this._loading = true;
+            this._$loading = new rxjs.BehaviorSubject(true);
             this.i18nFieldPrefix = null;
             this._subscription = new rxjs.Subscription();
             this.debug = false;
@@ -19155,9 +19155,25 @@
             });
             this.autocompleteFields = this.autocompleteHelper.fields;
         }
-        Object.defineProperty(AppForm.prototype, "_ready", {
+        Object.defineProperty(AppForm.prototype, "_loading", {
+            /**
+             *  @deprecated
+             */
             get: function () {
-                return this._$ready.value == true;
+                return this._$loading.value;
+            },
+            /**
+             *  @deprecated
+             */
+            set: function (value) {
+                this._$loading.next(value);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(AppForm.prototype, "loading", {
+            get: function () {
+                return this._$loading.value;
             },
             enumerable: false,
             configurable: true
@@ -19295,11 +19311,11 @@
             if (this.debug)
                 console.debug('[form] Updating form (using entity)', data);
             // Convert object to json, then apply it to form (e.g. convert 'undefined' into 'null')
-            AppFormUtils.copyEntity2Form(data, this.form, Object.assign({ emitEvent: false, onlySelf: true }, opts));
-            if (this._loading)
-                this.markAsLoaded(Object.assign({ emitEvent: false, onlySelf: true }, opts));
-            if (!opts || opts.emitEvent !== true)
+            AppFormUtils.copyEntity2Form(data, this.form, opts);
+            if (!opts || opts.emitEvent !== false) {
+                this.markAsLoaded({ emitEvent: false });
                 this.markForCheck();
+            }
         };
         AppForm.prototype.reset = function (data, opts) {
             if (data) {
@@ -19348,15 +19364,15 @@
                 this.markForCheck();
         };
         AppForm.prototype.markAsLoading = function (opts) {
-            if (!this._loading) {
-                this._loading = true;
+            if (this._$loading.value !== true) {
+                this._$loading.next(true);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
         };
         AppForm.prototype.markAsLoaded = function (opts) {
-            if (this._loading) {
-                this._loading = false;
+            if (this._$loading.value !== false) {
+                this._$loading.next(false);
                 if (!opts || opts.emitEvent !== false)
                     this.markForCheck();
             }
@@ -19457,7 +19473,6 @@
             _this.network = network;
             _this.cd = cd;
             _this.environment = environment;
-            _this.loading = false;
             _this.canWorkOffline = false;
             _this.showPwd = false;
             _this.onCancel = new i0.EventEmitter();
@@ -19508,13 +19523,13 @@
             }
             if (this.form.invalid || this.loading)
                 return;
-            this.loading = true;
+            this.markAsLoading();
             var data = this.form.value;
             this.showPwd = false; // Hide password
             this.error = null; // Reset error
             this.registerSubscription(this.onSubmit
                 .pipe(operators.debounceTime(500))
-                .subscribe(function (res) { return _this.loading = false; }));
+                .subscribe(function (res) { return _this.markAsLoaded(); }));
             setTimeout(function () { return _this.onSubmit.emit({
                 username: data.username,
                 password: data.password,
@@ -20269,7 +20284,6 @@
             _this.translate = translate;
             _this.settings = settings;
             _this.cd = cd;
-            _this.loading = true;
             _this.email = {
                 confirmed: false,
                 notConfirmed: false,
@@ -20299,7 +20313,7 @@
                     _this.onLogin(_this.accountService.account);
                 }
                 else {
-                    _this.loading = false;
+                    _this.markAsLoaded();
                 }
             }));
             return _this;
@@ -20317,7 +20331,7 @@
             this.enable();
             this.markAsPristine();
             this.startListenChanges();
-            this.loading = false;
+            this.markAsLoaded();
         };
         AccountPage.prototype.onLogout = function () {
             this.isLogin = false;
@@ -20335,7 +20349,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     this.disable();
-                    this.loading = true;
+                    this.markAsLoading();
                     return [2 /*return*/, this.accountService.refresh()];
                 });
             });
@@ -20869,7 +20883,6 @@
             _this.cd = cd;
             _this.network = network;
             _this.locales = locales;
-            _this.loading = true;
             _this.saving = false;
             _this.usageModes = ['FIELD', 'DESK'];
             _this.propertyDefinitionsByKey = {};
@@ -20959,7 +20972,7 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            this.loading = true;
+                            this.markAsLoading();
                             console.debug('[settings] Loading settings...');
                             data = this.settings.settings;
                             // Set defaults
@@ -20995,7 +21008,7 @@
             this.enable({ emitEvent: false });
             // Apply inheritance
             this.setAccountInheritance(data.accountInheritance, { emitEvent: false });
-            this.loading = false;
+            this.markAsLoaded();
             this.error = null;
             this.markForCheck();
         };
@@ -21234,7 +21247,6 @@
             _this.settings = settings;
             _this.cd = cd;
             _this.formGroupDir = formGroupDir;
-            _this.loading = true;
             _this.definitionsMapByKey = {};
             _this.definitionsByIndex = {};
             return _this;
@@ -21313,7 +21325,7 @@
             this.helper.resize(values.length);
             this.helper.formArray.patchValue(values, { emitEvent: false });
             this.markAsPristine();
-            this.loading = false;
+            this.markAsLoaded();
         };
         /* -- protected methods -- */
         AppPropertiesForm.prototype.getPropertyFormGroup = function (data) {
@@ -21359,7 +21371,6 @@
             _this.settings = settings;
             _this.cd = cd;
             _this.formGroupDir = formGroupDir;
-            _this.loading = true;
             _this.selection = new collections.SelectionModel(true, []);
             _this.displayWithFn = referentialToString;
             _this.onNewItem = new i0.EventEmitter();
@@ -21485,7 +21496,7 @@
             }
             this.selection.clear();
             this.markAsPristine();
-            this.loading = false;
+            this.markAsLoaded();
         };
         /** Whether the number of selected elements matches the total number of rows. */
         AppListForm.prototype.isAllSelected = function () {