@c8y/ngx-components 1011.0.29 → 1011.0.32

package/bundles/c8y-ngx-components-sub-assets.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@c8y/client'), require('@c8y/ngx-components'), require('@c8y/ngx-components/assets-navigator'), require('@ngx-translate/core'), require('@c8y/ngx-components/device-grid'), require('rxjs'), require('@angular/router'), require('ngx-bootstrap/modal'), require('ngx-bootstrap/popover'), require('@angular/forms')) :
-    typeof define === 'function' && define.amd ? define('@c8y/ngx-components/sub-assets', ['exports', '@angular/core', '@c8y/client', '@c8y/ngx-components', '@c8y/ngx-components/assets-navigator', '@ngx-translate/core', '@c8y/ngx-components/device-grid', 'rxjs', '@angular/router', 'ngx-bootstrap/modal', 'ngx-bootstrap/popover', '@angular/forms'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.c8y = global.c8y || {}, global.c8y['ngx-components'] = global.c8y['ngx-components'] || {}, global.c8y['ngx-components']['sub-assets'] = {}), global.ng.core, global.client, global.c8y['ngx-components'], global.c8y['ngx-components']['assets-navigator'], global.core$1, global.c8y['ngx-components']['device-grid'], global.rxjs, global.ng.router, global.modal, global.popover, global.ng.forms));
-}(this, (function (exports, core, client, ngxComponents, assetsNavigator, core$1, deviceGrid, rxjs, router, modal, popover, forms) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@c8y/client'), require('@c8y/ngx-components'), require('@c8y/ngx-components/assets-navigator'), require('@ngx-translate/core'), require('@c8y/ngx-components/device-grid'), require('@angular/router'), require('ngx-bootstrap/modal'), require('rxjs'), require('ngx-bootstrap/popover'), require('@angular/forms')) :
+    typeof define === 'function' && define.amd ? define('@c8y/ngx-components/sub-assets', ['exports', '@angular/core', '@c8y/client', '@c8y/ngx-components', '@c8y/ngx-components/assets-navigator', '@ngx-translate/core', '@c8y/ngx-components/device-grid', '@angular/router', 'ngx-bootstrap/modal', 'rxjs', 'ngx-bootstrap/popover', '@angular/forms'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.c8y = global.c8y || {}, global.c8y['ngx-components'] = global.c8y['ngx-components'] || {}, global.c8y['ngx-components']['sub-assets'] = {}), global.ng.core, global.client, global.c8y['ngx-components'], global.c8y['ngx-components']['assets-navigator'], global.core$1, global.c8y['ngx-components']['device-grid'], global.ng.router, global.modal, global.rxjs, global.popover, global.ng.forms));
+}(this, (function (exports, core, client, ngxComponents, assetsNavigator, core$1, deviceGrid, router, modal, rxjs, popover, forms) { 'use strict';
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -365,7 +365,6 @@
             _this.alertService = alertService;
             _this.permissionsService = permissionsService;
             _this.modal = modal;
-            _this.uiOnlyCountersUpdate = new rxjs.BehaviorSubject(null);
             _this.GRID_CONFIG_DEFAULT_STORAGE_KEY = 'sub-assets-grid-config';
             _this.IS_DEVICE_GROUP_FRAGMENT = 'c8y_IsDeviceGroup';
             _this.IS_DYNAMIC_GROUP_FRAGMENT = 'c8y_IsDynamicGroup';
@@ -1147,8 +1146,9 @@
     };
 
     var SubAssetsGridComponent = /** @class */ (function () {
-        function SubAssetsGridComponent(subAssetsGridService, bsModalService, smartGroupsService) {
+        function SubAssetsGridComponent(subAssetsGridService, alert, bsModalService, smartGroupsService) {
             this.subAssetsGridService = subAssetsGridService;
+            this.alert = alert;
             this.bsModalService = bsModalService;
             this.smartGroupsService = smartGroupsService;
             this.title = ngxComponents.gettext('Subassets');
@@ -1335,10 +1335,10 @@
                             switch (_a.label) {
                                 case 0:
                                     if (!result) return [3 /*break*/, 2];
-                                    this.subAssetsGridService.uiOnlyCountersUpdate.next('DECREASE');
                                     return [4 /*yield*/, this.subAssetsGridService.deleteAsset(asset, parentRef, result)];
                                 case 1:
                                     _a.sent();
+                                    this.alert.warning(ngxComponents.gettext('The counter for the total number of items might be inaccurate.'));
                                     this.refresh.emit();
                                     _a.label = 2;
                                 case 2: return [2 /*return*/];
@@ -1359,21 +1359,14 @@
         };
         SubAssetsGridComponent.prototype.onDataSourceModifier = function (dataSourceModifier) {
             return __awaiter(this, void 0, void 0, function () {
-                var promises, counters, action, _a, dataResponse, size, filteredSize;
+                var promises, counters, _a, dataResponse, size, filteredSize;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
                             promises = [];
                             promises.push(this.subAssetsGridService.getData(dataSourceModifier.columns, dataSourceModifier.pagination, this.parentGroup, this.baseQuery));
-                            action = this.subAssetsGridService.uiOnlyCountersUpdate.value;
-                            if (action) {
-                                counters = this.uiOnlyCountersUpdate(action);
-                                this.subAssetsGridService.uiOnlyCountersUpdate.next(null);
-                            }
-                            else {
-                                promises.push(this.subAssetsGridService.getTotal(this.parentGroup, this.baseQuery));
-                                promises.push(this.subAssetsGridService.getCount(dataSourceModifier.columns, dataSourceModifier.pagination, this.parentGroup, this.baseQuery));
-                            }
+                            promises.push(this.subAssetsGridService.getTotal(this.parentGroup, this.baseQuery));
+                            promises.push(this.subAssetsGridService.getCount(dataSourceModifier.columns, dataSourceModifier.pagination, this.parentGroup, this.baseQuery));
                             return [4 /*yield*/, Promise.all(promises)];
                         case 1:
                             _a = __read.apply(void 0, [_b.sent(), 3]), dataResponse = _a[0], size = _a[1], filteredSize = _a[2];
@@ -1392,25 +1385,6 @@
         SubAssetsGridComponent.prototype.configChange = function (config) {
             this.subAssetsGridService.saveConfig(config);
         };
-        // workaround since the totalPages value is cached on the BE
-        SubAssetsGridComponent.prototype.uiOnlyCountersUpdate = function (action) {
-            var currentAllItemsCount = this.dataGrid.filteringLabelsParams.allItemsCount;
-            var currentFilteredItemsCount = this.dataGrid.filteringLabelsParams.filteredItemsCount;
-            var counters;
-            if (action === 'DECREASE') {
-                counters = {
-                    size: currentAllItemsCount - 1,
-                    filteredSize: currentFilteredItemsCount - 1
-                };
-            }
-            if (action === 'INCREASE') {
-                counters = {
-                    size: currentAllItemsCount + 1,
-                    filteredSize: currentFilteredItemsCount + 1
-                };
-            }
-            return counters;
-        };
         return SubAssetsGridComponent;
     }());
     SubAssetsGridComponent.decorators = [
@@ -1421,6 +1395,7 @@
     ];
     SubAssetsGridComponent.ctorParameters = function () { return [
         { type: SubAssetsService },
+        { type: ngxComponents.AlertService },
         { type: modal.BsModalService },
         { type: client.SmartGroupsService }
     ]; };
@@ -1588,7 +1563,6 @@
                                 return [2 /*return*/];
                             }
                             this.pendingStatus = true;
-                            this.subAssetsService.uiOnlyCountersUpdate.next('INCREASE');
                             return [4 /*yield*/, this.addGroupService.createGroupAndAssignDevices(this.formGroupStepOne.value, this.currentGroupId, this.selected)];
                         case 1:
                             _a.sent();