@sd-angular/core 1.3.95 → 1.3.97

package/bundles/sd-angular-core-grid-material.umd.js

@@ -451,7 +451,7 @@
                 _this.cdRef.markForCheck();
             };
             this.onApply = function () {
-                _this.filterRegister.set({
+                __classPrivateFieldGet(_this, _filterRegister).set({
                     inlineColumn: _this.inlineColumn,
                     columnFilter: _this.columnFilter,
                     inlineExternal: _this.inlineExternal,
@@ -502,13 +502,14 @@
                 _this.externalFilter = JSON.parse(JSON.stringify(configuration.externalFilter));
                 _this.inlineFilterDef = JSON.parse(JSON.stringify(configuration.inlineFilterDef));
                 _this.filterDef = JSON.parse(JSON.stringify(configuration.filterDef));
+                _this.cdRef.markForCheck();
             }));
         };
         SdPopupFilter.prototype.ngOnDestroy = function () {
             __classPrivateFieldGet(this, _subscription).unsubscribe();
         };
         SdPopupFilter.prototype.onClear = function () {
-            this.filterRegister.remove();
+            __classPrivateFieldGet(this, _filterRegister).remove();
             this.modal.close();
             this.cdRef.markForCheck();
         };
@@ -609,8 +610,8 @@
                     _this.externalFilter = configuration.externalFilter;
                     _this.inlineFilterDef = configuration.inlineFilterDef;
                     _this.filterDef = configuration.filterDef;
+                    _this.ref.markForCheck();
                 }));
-                _this.ref.markForCheck();
             }));
         };
         // #loadDefault = () => {
@@ -1686,7 +1687,7 @@
         function SdGridFilterService(settingService) {
             var _this = this;
             this.settingService = settingService;
-            _prefix$1.set(this, '61d22e8e-eee8-4aad-8e1c-044a532fea91');
+            _prefix$1.set(this, 'GRID-FILTER');
             this.register = function (key, args) {
                 var cacheSession = false;
                 if (!key) {
@@ -1875,7 +1876,7 @@
         { type: setting.SdSettingService }
     ]; };
 
-    var _localItems, _paginator, _sort, _subscription$2, _reload, _loadCompleted, _initCellDef, _initFilterDef, _initFooterDef, _filterExportInfo, _initConfiguration, _loadFilterRegister, _filterLocal, _getFilter, _load$1, _render, _exportedItems, _allColumns, _allExportedColumns, _onExport, _updateSelectedItems;
+    var _optionChanges, _localItems, _paginator, _sort, _subscription$2, _reload, _loadCompleted, _initCellDef, _initFilterDef, _initFooterDef, _filterExportInfo, _initConfiguration, _loadFilterRegister, _filterLocal, _getFilter, _load$1, _render, _exportedItems, _allColumns, _allExportedColumns, _onExport, _updateSelectedItems;
     var SdGridMaterial = /** @class */ (function () {
         function SdGridMaterial(ref, configuration, gridConfigurationService, exportService, notifyService, columnValuesPipe, gridFilterService, editorHandlerColumnPipe) {
             var _this = this;
@@ -1888,6 +1889,7 @@
             this.gridFilterService = gridFilterService;
             this.editorHandlerColumnPipe = editorHandlerColumnPipe;
             this.key = uuid.v4();
+            _optionChanges.set(this, new rxjs.Subject());
             _localItems.set(this, []);
             this.items = [];
             this.selectedItems = [];
@@ -1938,7 +1940,6 @@
             });
             _initFilterDef.set(this, function () {
                 var e_2, _3;
-                var _a;
                 _this.filterDefs = [];
                 try {
                     for (var _4 = __values(_this.sdFilterDefs), _5 = _4.next(); !_5.done; _5 = _4.next()) {
@@ -1953,9 +1954,9 @@
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
-                if ((_a = _this.filterDefs) === null || _a === void 0 ? void 0 : _a.length) {
-                    __classPrivateFieldGet(_this, _loadFilterRegister).call(_this);
-                }
+                // if (this.filterDefs?.length) {
+                //   this.#loadFilterRegister();
+                // }
             });
             _initFooterDef.set(this, function () {
                 var e_3, _3;
@@ -3048,7 +3049,7 @@
                 if (option) {
                     option = __classPrivateFieldGet(this, _initConfiguration).call(this, option);
                     this.gridOption = option;
-                    __classPrivateFieldGet(this, _loadFilterRegister).call(this);
+                    // this.#loadFilterRegister();
                     __classPrivateFieldSet(this, _loadCompleted, false);
                     // this.#reload.next({
                     //   force: true,
@@ -3056,6 +3057,7 @@
                     var configuration = this.gridConfigurationService.init(this.key, this.gridOption);
                     this.gridConfigurationObserver = configuration.observer;
                     configuration.load();
+                    __classPrivateFieldGet(this, _optionChanges).next(this.gridOption);
                 }
             },
             enumerable: false,
@@ -3113,12 +3115,12 @@
             __classPrivateFieldGet(this, _subscription$2).add(this.sdCellDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
             __classPrivateFieldGet(this, _subscription$2).add(this.sdFooterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFooterDef)));
             __classPrivateFieldGet(this, _subscription$2).add(this.sdFilterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFilterDef)));
-            // this.#subscription.add(this.#optionChanges.pipe(
-            //   debounceTime(200),
-            //   startWith({}),
-            //   map(this.#getFilter),
-            //   switchMap(filterInfo => this.#load(filterInfo, true))
-            // ).subscribe(this.#render));
+            __classPrivateFieldGet(this, _subscription$2).add(rxjs.combineLatest([
+                __classPrivateFieldGet(this, _optionChanges).pipe(operators.startWith(this.gridOption)),
+                this.sdFilterDefs.changes.pipe(operators.startWith(this.filterDefs))
+            ]).subscribe(function (a) {
+                __classPrivateFieldGet(_this, _loadFilterRegister).call(_this);
+            }));
             this.ref.detectChanges();
         };
         SdGridMaterial.prototype.ngOnDestroy = function () {
@@ -3181,7 +3183,7 @@
         });
         return SdGridMaterial;
     }());
-    _localItems = new WeakMap(), _paginator = new WeakMap(), _sort = new WeakMap(), _subscription$2 = new WeakMap(), _reload = new WeakMap(), _loadCompleted = new WeakMap(), _initCellDef = new WeakMap(), _initFilterDef = new WeakMap(), _initFooterDef = new WeakMap(), _filterExportInfo = new WeakMap(), _initConfiguration = new WeakMap(), _loadFilterRegister = new WeakMap(), _filterLocal = new WeakMap(), _getFilter = new WeakMap(), _load$1 = new WeakMap(), _render = new WeakMap(), _exportedItems = new WeakMap(), _allColumns = new WeakMap(), _allExportedColumns = new WeakMap(), _onExport = new WeakMap(), _updateSelectedItems = new WeakMap();
+    _optionChanges = new WeakMap(), _localItems = new WeakMap(), _paginator = new WeakMap(), _sort = new WeakMap(), _subscription$2 = new WeakMap(), _reload = new WeakMap(), _loadCompleted = new WeakMap(), _initCellDef = new WeakMap(), _initFilterDef = new WeakMap(), _initFooterDef = new WeakMap(), _filterExportInfo = new WeakMap(), _initConfiguration = new WeakMap(), _loadFilterRegister = new WeakMap(), _filterLocal = new WeakMap(), _getFilter = new WeakMap(), _load$1 = new WeakMap(), _render = new WeakMap(), _exportedItems = new WeakMap(), _allColumns = new WeakMap(), _allExportedColumns = new WeakMap(), _onExport = new WeakMap(), _updateSelectedItems = new WeakMap();
     SdGridMaterial.decorators = [
         { type: core.Component, args: [{
                     selector: 'sd-grid-material',