@sd-angular/core 1.3.99 → 1.3.100

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

@@ -451,22 +451,16 @@
                 _this.cdRef.markForCheck();
             };
             this.onApply = function () {
-                __classPrivateFieldGet(_this, _filterRegister).set({
+                __classPrivateFieldGet(_this, _filterRegister).configuration.set({
                     inlineColumn: _this.inlineColumn,
-                    columnFilter: _this.columnFilter,
                     inlineExternal: _this.inlineExternal,
-                    externalFilter: _this.externalFilter,
                     inlineFilterDef: _this.inlineFilterDef,
+                });
+                __classPrivateFieldGet(_this, _filterRegister).value.set({
+                    columnFilter: _this.columnFilter,
+                    externalFilter: _this.externalFilter,
                     filterDef: _this.filterDef
                 });
-                // this.changeFilter.emit({
-                //   inlineColumn: this.inlineColumn || {},
-                //   columnFilter: this.columnFilter || {},
-                //   inlineExternal: this.inlineExternal || {},
-                //   externalFilter: this.externalFilter || {},
-                //   inlineFilterDef: this.inlineFilterDef || {},
-                //   filterDef: this.filterDef || {}
-                // });
                 _this.modal.close();
                 _this.cdRef.markForCheck();
             };
@@ -481,27 +475,16 @@
         ;
         SdPopupFilter.prototype.ngAfterViewInit = function () {
             var _this = this;
-            // this.#subscription.add(this.#filterOptionChanges.pipe(startWith(this.filter)).subscribe(() => {
-            //   if (this.filter?.disabled) {
-            //     this.filterChange.next(true);
-            //     return;
-            //   }
-            //   this.externalFilters = this.filter?.externalFilters || [];
-            //   const configuration = this.gridFilterService.get(this.filter?.key);
-            //   this.inlineColumn = configuration.inlineColumn;
-            //   this.inlineExternal = configuration.inlineExternal;
-            //   this.inlineFilterDef = configuration.inlineFilterDef;
-            //   this.#loadDefault();
-            //   this.filterChange.next(true);
-            //   this.ref.markForCheck();
-            // }));
-            __classPrivateFieldGet(this, _subscription).add(__classPrivateFieldGet(this, _filterRegister).observer.subscribe(function (configuration) {
+            __classPrivateFieldGet(this, _subscription).add(__classPrivateFieldGet(this, _filterRegister).configuration.observer.subscribe(function (configuration) {
                 _this.inlineColumn = JSON.parse(JSON.stringify(configuration.inlineColumn));
-                _this.columnFilter = JSON.parse(JSON.stringify(configuration.columnFilter));
                 _this.inlineExternal = JSON.parse(JSON.stringify(configuration.inlineExternal));
-                _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();
+            }));
+            __classPrivateFieldGet(this, _subscription).add(__classPrivateFieldGet(this, _filterRegister).value.observer.subscribe(function (filterValue) {
+                _this.columnFilter = JSON.parse(JSON.stringify(filterValue.columnFilter));
+                _this.externalFilter = JSON.parse(JSON.stringify(filterValue.externalFilter));
+                _this.filterDef = JSON.parse(JSON.stringify(filterValue.filterDef));
                 _this.cdRef.markForCheck();
             }));
         };
@@ -509,7 +492,7 @@
             __classPrivateFieldGet(this, _subscription).unsubscribe();
         };
         SdPopupFilter.prototype.onClear = function () {
-            __classPrivateFieldGet(this, _filterRegister).remove();
+            __classPrivateFieldGet(this, _filterRegister).value.remove();
             this.modal.close();
             this.cdRef.markForCheck();
         };
@@ -553,20 +536,15 @@
             this.inlineExternal = {};
             _subscription$1.set(this, new rxjs.Subscription());
             this.onFilter = function (item) {
-                _this.filterRegister.set({
+                _this.filterRegister.value.set({
                     columnFilter: _this.columnFilter,
                     externalFilter: _this.externalFilter,
                     filterDef: _this.filterDef
                 });
-                // this.filterChange.next(true);
             };
             this.open = function () {
                 _this.popupFilter.open();
             };
-            this.onReset = function () {
-                _this.filterRegister.remove();
-                _this.ref.markForCheck();
-            };
             this.isMobileOrTablet = !this.deviceService.isDesktop();
             this.ref.markForCheck();
         }
@@ -595,53 +573,19 @@
         ;
         SdGridFilter.prototype.ngAfterViewInit = function () {
             var _this = this;
-            // this.#subscription.add(this.#filterOptionChanges.pipe(startWith(this.filter)).subscribe(() => {
-            //   if (this.filter?.disabled) {
-            //     this.filterChange.next(true);
-            //     return;
-            //   }
-            //   this.externalFilters = this.filter?.externalFilters || [];
-            //   const configuration = this.gridFilterService.get(this.filter?.key);
-            //   this.inlineColumn = configuration.inlineColumn;
-            //   this.inlineExternal = configuration.inlineExternal;
-            //   this.inlineFilterDef = configuration.inlineFilterDef;
-            //   this.#loadDefault();
-            //   this.filterChange.next(true);
-            //   this.ref.markForCheck();
-            // }));
-            __classPrivateFieldGet(this, _subscription$1).add(this.filterRegisterChange.pipe(operators.startWith(this.filterRegister)).subscribe(function () {
-                __classPrivateFieldGet(_this, _subscription$1).add(_this.filterRegister.observer.subscribe(function (configuration) {
-                    _this.inlineColumn = configuration.inlineColumn;
-                    _this.columnFilter = configuration.columnFilter;
-                    _this.inlineExternal = configuration.inlineExternal;
-                    _this.externalFilter = configuration.externalFilter;
-                    _this.inlineFilterDef = configuration.inlineFilterDef;
-                    _this.filterDef = configuration.filterDef;
-                    _this.ref.markForCheck();
-                }));
+            __classPrivateFieldGet(this, _subscription$1).add(this.filterRegister.configuration.observer.subscribe(function (configuration) {
+                _this.inlineColumn = configuration.inlineColumn;
+                _this.inlineExternal = configuration.inlineExternal;
+                _this.inlineFilterDef = configuration.inlineFilterDef;
+                _this.ref.markForCheck();
+            }));
+            __classPrivateFieldGet(this, _subscription$1).add(this.filterRegister.value.observer.subscribe(function (value) {
+                _this.columnFilter = value.columnFilter;
+                _this.externalFilter = value.externalFilter;
+                _this.filterDef = value.filterDef;
+                _this.ref.markForCheck();
             }));
         };
-        // #loadDefault = () => {
-        //   for (const column of this.columns) {
-        //     this.inlineColumn[column.field] = this.inlineColumn[column.field] ?? column?.filter?.defaultShowing;
-        //     this.columnFilter[column.field] = this.columnFilter[column.field] ?? column?.filter?.default;
-        //   }
-        //   for (const externalFilter of this.externalFilters) {
-        //     this.inlineExternal[externalFilter.field] = this.inlineExternal[externalFilter.field] ?? externalFilter?.defaultShowing;
-        //     if (externalFilter.type === 'daterange') {
-        //       this.externalFilter[externalFilter.field] = {
-        //         from: this.externalFilter[externalFilter.field]?.from ?? externalFilter.default?.from ?? undefined,
-        //         to: this.externalFilter[externalFilter.field]?.to ?? externalFilter.default?.to ?? undefined
-        //       };
-        //     } else {
-        //       this.externalFilter[externalFilter.field] = this.externalFilter[externalFilter.field] ?? externalFilter.default;
-        //     }
-        //   }
-        //   for (const filterDef of this.filterDefs) {
-        //     this.inlineFilterDef[filterDef.sdMaterialFilterDef] =
-        //       this.inlineFilterDef[filterDef.sdMaterialFilterDef] ?? filterDef?.defaultShowing;
-        //   }
-        // }
         SdGridFilter.prototype.ngOnDestroy = function () {
             __classPrivateFieldGet(this, _subscription$1).unsubscribe();
         };
@@ -1690,193 +1634,217 @@
         { type: core.NgZone }
     ]; };
 
-    var _prefix$1, _loadDefault;
+    var _filterConfiguration, _filterValue, _cache$2, _loadDefaultConfiguration, _loadDefaultValue;
     var SdGridFilterService = /** @class */ (function () {
         function SdGridFilterService(settingService) {
             var _this = this;
             this.settingService = settingService;
-            _prefix$1.set(this, 'GRID-FILTER');
+            _filterConfiguration.set(this, 'GRID-FILTER-CONFIGURATION');
+            _filterValue.set(this, 'GRID-FILTER-VALUE');
+            _cache$2.set(this, {});
             this.register = function (key, args) {
                 var cacheSession = false;
                 if (!key) {
-                    key = uuid.v4();
+                    var columns = args.columns, externalFilters = args.externalFilters;
+                    key = hash__default['default']({
+                        columns: columns,
+                        externalFilters: externalFilters
+                    });
                     cacheSession = true; // Nếu không có key thì chỉ lưu theo session
                 }
-                var _r = _this.settingService.create({
-                    prefix: __classPrivateFieldGet(_this, _prefix$1),
-                    key: key
-                }, {
-                    default: __classPrivateFieldGet(_this, _loadDefault).call(_this, args),
-                    type: cacheSession ? 'session' : undefined
-                }), get = _r.get, set = _r.set, remove = _r.remove, subject = _r.subject, observer = _r.observer;
-                return {
-                    get: function () {
-                        var _a;
-                        var configuration = get();
-                        return {
-                            selectedQuickFilter: (_a = configuration === null || configuration === void 0 ? void 0 : configuration.selectedQuickFilter) !== null && _a !== void 0 ? _a : null,
-                            quickFilters: (configuration === null || configuration === void 0 ? void 0 : configuration.quickFilters) || [],
-                            // Filter column
-                            inlineColumn: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {},
-                            columnFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {},
-                            // Filter external
-                            inlineExternal: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {},
-                            externalFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {},
-                            // Filter def
-                            inlineFilterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {},
-                            filterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}
-                        };
-                    },
-                    set: function (configuration) {
-                        var keys = Object.keys(configuration || {});
-                        var current = get();
-                        var selectedQuickFilter = current.selectedQuickFilter, quickFilters = current.quickFilters, inlineColumn = current.inlineColumn, columnFilter = current.columnFilter, inlineExternal = current.inlineExternal, externalFilter = current.externalFilter, inlineFilterDef = current.inlineFilterDef, filterDef = current.filterDef;
-                        var updatedConfiguration = {
-                            selectedQuickFilter: keys.includes('selectedQuickFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.selectedQuickFilter) || null) : selectedQuickFilter,
-                            quickFilters: keys.includes('quickFilters') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.quickFilters) || []) : quickFilters,
-                            // Filter column
-                            inlineColumn: keys.includes('inlineColumn') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {}) : inlineColumn,
-                            columnFilter: keys.includes('columnFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {}) : columnFilter,
-                            // Filter external
-                            inlineExternal: keys.includes('inlineExternal') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {}) : inlineExternal,
-                            externalFilter: keys.includes('externalFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {}) : externalFilter,
-                            // Filter def
-                            inlineFilterDef: keys.includes('inlineFilterDef') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {}) : inlineFilterDef,
-                            filterDef: keys.includes('filterDef') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}) : filterDef,
-                        };
-                        set(updatedConfiguration);
-                        return updatedConfiguration;
-                    },
-                    remove: function () {
-                        remove();
-                    },
-                    subject: subject,
-                    observer: observer
-                };
+                if (!__classPrivateFieldGet(_this, _cache$2)[key]) {
+                    var filterConfiguration_1 = _this.settingService.create({
+                        prefix: __classPrivateFieldGet(_this, _filterConfiguration),
+                        key: key
+                    }, {
+                        default: __classPrivateFieldGet(_this, _loadDefaultConfiguration).call(_this, args),
+                        type: cacheSession ? 'session' : undefined
+                    });
+                    var filterValue_1 = _this.settingService.create({
+                        prefix: __classPrivateFieldGet(_this, _filterValue),
+                        key: key
+                    }, {
+                        default: __classPrivateFieldGet(_this, _loadDefaultValue).call(_this, args),
+                        type: cacheSession ? 'session' : undefined
+                    });
+                    __classPrivateFieldGet(_this, _cache$2)[key] = {
+                        configuration: {
+                            get: function () {
+                                var configuration = filterConfiguration_1.get();
+                                return {
+                                    // Filter column
+                                    inlineColumn: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {},
+                                    // Filter external
+                                    inlineExternal: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {},
+                                    // Filter def
+                                    inlineFilterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {},
+                                };
+                            },
+                            set: function (configuration) {
+                                var keys = Object.keys(configuration || {});
+                                var current = filterConfiguration_1.get();
+                                var inlineColumn = current.inlineColumn, inlineExternal = current.inlineExternal, inlineFilterDef = current.inlineFilterDef;
+                                var updatedConfiguration = {
+                                    // Filter column
+                                    inlineColumn: keys.includes('inlineColumn') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {}) : inlineColumn,
+                                    // Filter external
+                                    inlineExternal: keys.includes('inlineExternal') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {}) : inlineExternal,
+                                    // Filter def
+                                    inlineFilterDef: keys.includes('inlineFilterDef') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {}) : inlineFilterDef,
+                                };
+                                filterConfiguration_1.set(updatedConfiguration);
+                                return updatedConfiguration;
+                            },
+                            remove: function () {
+                                filterConfiguration_1.remove();
+                            },
+                            observer: filterConfiguration_1.observer
+                        },
+                        value: {
+                            get: function () {
+                                var configuration = filterValue_1.get();
+                                return {
+                                    // Filter column
+                                    columnFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {},
+                                    // Filter external
+                                    externalFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {},
+                                    // Filter def
+                                    filterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}
+                                };
+                            },
+                            set: function (configuration) {
+                                var keys = Object.keys(configuration || {});
+                                var current = filterValue_1.get();
+                                var columnFilter = current.columnFilter, externalFilter = current.externalFilter, filterDef = current.filterDef;
+                                var updatedConfiguration = {
+                                    // Filter column
+                                    columnFilter: keys.includes('columnFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {}) : columnFilter,
+                                    // Filter external
+                                    externalFilter: keys.includes('externalFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {}) : externalFilter,
+                                    // Filter def
+                                    filterDef: keys.includes('filterDef') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}) : filterDef,
+                                };
+                                filterValue_1.set(updatedConfiguration);
+                                return updatedConfiguration;
+                            },
+                            remove: function () {
+                                filterValue_1.remove();
+                            },
+                            observer: filterValue_1.observer
+                        }
+                    };
+                }
+                return __classPrivateFieldGet(_this, _cache$2)[key];
             };
-            _loadDefault.set(this, function (args) {
-                var e_1, _r, e_2, _s, e_3, _t;
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+            _loadDefaultConfiguration.set(this, function (args) {
+                var e_1, _m, e_2, _o, e_3, _p;
+                var _a, _b, _c, _d;
                 var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
                 var inlineColumn = {};
-                var columnFilter = {};
                 var inlineExternal = {};
-                var externalFilter = {};
                 var inlineFilterDef = {};
-                var filterDef = {};
                 try {
                     // Filter column
-                    for (var _u = __values((columns || [])), _v = _u.next(); !_v.done; _v = _u.next()) {
-                        var item = _v.value;
+                    for (var _q = __values((columns || [])), _r = _q.next(); !_r.done; _r = _q.next()) {
+                        var item = _r.value;
                         inlineColumn[item.field] = (_a = inlineColumn[item.field]) !== null && _a !== void 0 ? _a : (_b = item === null || item === void 0 ? void 0 : item.filter) === null || _b === void 0 ? void 0 : _b.defaultShowing;
-                        columnFilter[item.field] = (_c = columnFilter[item.field]) !== null && _c !== void 0 ? _c : (_d = item === null || item === void 0 ? void 0 : item.filter) === null || _d === void 0 ? void 0 : _d.default;
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_v && !_v.done && (_r = _u.return)) _r.call(_u);
+                        if (_r && !_r.done && (_m = _q.return)) _m.call(_q);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
                 try {
                     // Filter external
-                    for (var _w = __values((externalFilters || [])), _x = _w.next(); !_x.done; _x = _w.next()) {
-                        var item = _x.value;
-                        inlineExternal[item.field] = (_e = inlineExternal[item.field]) !== null && _e !== void 0 ? _e : item === null || item === void 0 ? void 0 : item.defaultShowing;
-                        if (item.type === 'daterange') {
-                            externalFilter[item.field] = {
-                                from: (_j = (_g = (_f = externalFilter[item.field]) === null || _f === void 0 ? void 0 : _f.from) !== null && _g !== void 0 ? _g : (_h = item.default) === null || _h === void 0 ? void 0 : _h.from) !== null && _j !== void 0 ? _j : undefined,
-                                to: (_o = (_l = (_k = externalFilter[item.field]) === null || _k === void 0 ? void 0 : _k.to) !== null && _l !== void 0 ? _l : (_m = item.default) === null || _m === void 0 ? void 0 : _m.to) !== null && _o !== void 0 ? _o : undefined
-                            };
-                        }
-                        else {
-                            externalFilter[item.field] = (_p = externalFilter[item.field]) !== null && _p !== void 0 ? _p : item.default;
-                        }
+                    for (var _s = __values((externalFilters || [])), _t = _s.next(); !_t.done; _t = _s.next()) {
+                        var item = _t.value;
+                        inlineExternal[item.field] = (_c = inlineExternal[item.field]) !== null && _c !== void 0 ? _c : item === null || item === void 0 ? void 0 : item.defaultShowing;
                     }
                 }
                 catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
-                        if (_x && !_x.done && (_s = _w.return)) _s.call(_w);
+                        if (_t && !_t.done && (_o = _s.return)) _o.call(_s);
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
                 try {
                     // Filter def
-                    for (var _y = __values((filterDefs || [])), _z = _y.next(); !_z.done; _z = _y.next()) {
-                        var item = _z.value;
-                        inlineFilterDef[item.sdMaterialFilterDef] = (_q = inlineFilterDef[item.sdMaterialFilterDef]) !== null && _q !== void 0 ? _q : item === null || item === void 0 ? void 0 : item.defaultShowing;
+                    for (var _u = __values((filterDefs || [])), _v = _u.next(); !_v.done; _v = _u.next()) {
+                        var item = _v.value;
+                        inlineFilterDef[item.sdMaterialFilterDef] = (_d = inlineFilterDef[item.sdMaterialFilterDef]) !== null && _d !== void 0 ? _d : item === null || item === void 0 ? void 0 : item.defaultShowing;
                     }
                 }
                 catch (e_3_1) { e_3 = { error: e_3_1 }; }
                 finally {
                     try {
-                        if (_z && !_z.done && (_t = _y.return)) _t.call(_y);
+                        if (_v && !_v.done && (_p = _u.return)) _p.call(_u);
                     }
                     finally { if (e_3) throw e_3.error; }
                 }
                 return {
-                    quickFilters: [],
-                    selectedQuickFilter: null,
                     inlineColumn: inlineColumn,
-                    columnFilter: columnFilter,
                     inlineExternal: inlineExternal,
-                    externalFilter: externalFilter,
                     inlineFilterDef: inlineFilterDef,
-                    filterDef: filterDef,
                 };
             });
-            this.get = function (key) {
-                var _a;
-                if (!key) {
-                    return {
-                        selectedQuickFilter: null,
-                        quickFilters: [],
-                        inlineExternal: {},
-                        inlineColumn: {},
-                        inlineFilterDef: {}
-                    };
+            _loadDefaultValue.set(this, function (args) {
+                var e_4, _m, e_5, _o;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+                var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
+                var columnFilter = {};
+                var externalFilter = {};
+                var filterDef = {};
+                try {
+                    // Filter column
+                    for (var _p = __values((columns || [])), _q = _p.next(); !_q.done; _q = _p.next()) {
+                        var item = _q.value;
+                        columnFilter[item.field] = (_a = columnFilter[item.field]) !== null && _a !== void 0 ? _a : (_b = item === null || item === void 0 ? void 0 : item.filter) === null || _b === void 0 ? void 0 : _b.default;
+                    }
+                }
+                catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                finally {
+                    try {
+                        if (_q && !_q.done && (_m = _p.return)) _m.call(_p);
+                    }
+                    finally { if (e_4) throw e_4.error; }
+                }
+                try {
+                    // Filter external
+                    for (var _r = __values((externalFilters || [])), _s = _r.next(); !_s.done; _s = _r.next()) {
+                        var item = _s.value;
+                        if (item.type === 'daterange') {
+                            externalFilter[item.field] = {
+                                from: (_f = (_d = (_c = externalFilter[item.field]) === null || _c === void 0 ? void 0 : _c.from) !== null && _d !== void 0 ? _d : (_e = item.default) === null || _e === void 0 ? void 0 : _e.from) !== null && _f !== void 0 ? _f : undefined,
+                                to: (_k = (_h = (_g = externalFilter[item.field]) === null || _g === void 0 ? void 0 : _g.to) !== null && _h !== void 0 ? _h : (_j = item.default) === null || _j === void 0 ? void 0 : _j.to) !== null && _k !== void 0 ? _k : undefined
+                            };
+                        }
+                        else {
+                            externalFilter[item.field] = (_l = externalFilter[item.field]) !== null && _l !== void 0 ? _l : item.default;
+                        }
+                    }
                 }
-                var get = _this.settingService.create({
-                    prefix: __classPrivateFieldGet(_this, _prefix$1),
-                    key: key
-                }).get;
-                var configuration = get();
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                finally {
+                    try {
+                        if (_s && !_s.done && (_o = _r.return)) _o.call(_r);
+                    }
+                    finally { if (e_5) throw e_5.error; }
+                }
+                // Filter def
                 return {
-                    selectedQuickFilter: (_a = configuration === null || configuration === void 0 ? void 0 : configuration.selectedQuickFilter) !== null && _a !== void 0 ? _a : null,
-                    quickFilters: (configuration === null || configuration === void 0 ? void 0 : configuration.quickFilters) || [],
-                    inlineExternal: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {},
-                    inlineColumn: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {},
-                    inlineFilterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {},
-                };
-            };
-            this.set = function (key, configuration) {
-                configuration = {
-                    selectedQuickFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.selectedQuickFilter) || null,
-                    quickFilters: (configuration === null || configuration === void 0 ? void 0 : configuration.quickFilters) || [],
-                    inlineExternal: configuration.inlineExternal || {},
-                    inlineColumn: configuration.inlineColumn || {},
-                    inlineFilterDef: configuration.inlineFilterDef || {}
+                    columnFilter: columnFilter,
+                    externalFilter: externalFilter,
+                    filterDef: filterDef,
                 };
-                if (!key) {
-                    return configuration;
-                }
-                var set = _this.settingService.create({
-                    prefix: __classPrivateFieldGet(_this, _prefix$1),
-                    key: key
-                }).set;
-                key = hash__default['default']({
-                    prefix: __classPrivateFieldGet(_this, _prefix$1),
-                    key: key
-                });
-                set(configuration);
-                return configuration;
-            };
+            });
         }
         return SdGridFilterService;
     }());
-    _prefix$1 = new WeakMap(), _loadDefault = new WeakMap();
+    _filterConfiguration = new WeakMap(), _filterValue = new WeakMap(), _cache$2 = new WeakMap(), _loadDefaultConfiguration = new WeakMap(), _loadDefaultValue = new WeakMap();
     SdGridFilterService.decorators = [
         { type: core.Injectable }
     ];
@@ -1989,7 +1957,7 @@
             });
             _filterExportInfo.set(this, function (pageNumber, pageSize) {
                 var _a, _b;
-                var _3 = _this.filterRegister.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
+                var _3 = _this.filterRegister.value.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
                 return {
                     rawColumnFilter: columnFilter || {},
                     rawExternalFilter: externalFilter || {},
@@ -2015,18 +1983,20 @@
             _loadFilterRegister.set(this, function () {
                 var _a, _b, _c, _d, _e;
                 // Init filter
-                _this.filterRegister = _this.gridFilterService.register((_b = (_a = _this.gridOption) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.key, {
-                    columns: (_c = _this.gridOption) === null || _c === void 0 ? void 0 : _c.columns,
-                    externalFilters: (_e = (_d = _this.gridOption) === null || _d === void 0 ? void 0 : _d.filter) === null || _e === void 0 ? void 0 : _e.externalFilters,
-                    filterDefs: _this.filterDefs
-                });
-                __classPrivateFieldGet(_this, _subscription$2).add(_this.filterRegister.observer.pipe(operators.debounceTime(500), operators.map(function (configuration) {
-                    _this.columnFilter = configuration.columnFilter;
-                    __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
-                    __classPrivateFieldGet(_this, _reload).next({
-                        force: false,
+                if (_this.gridOption) {
+                    _this.filterRegister = _this.gridFilterService.register((_b = (_a = _this.gridOption) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.key, {
+                        columns: (_c = _this.gridOption) === null || _c === void 0 ? void 0 : _c.columns,
+                        externalFilters: (_e = (_d = _this.gridOption) === null || _d === void 0 ? void 0 : _d.filter) === null || _e === void 0 ? void 0 : _e.externalFilters,
+                        filterDefs: _this.filterDefs
                     });
-                })).subscribe());
+                    __classPrivateFieldGet(_this, _subscription$2).add(_this.filterRegister.value.observer.pipe(operators.debounceTime(500), operators.map(function (filterValue) {
+                        _this.columnFilter = filterValue.columnFilter;
+                        __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
+                        __classPrivateFieldGet(_this, _reload).next({
+                            force: false,
+                        });
+                    })).subscribe());
+                }
             });
             _filterLocal.set(this, function (localItems, filterInfo) {
                 var columns = _this.gridOption.columns;
@@ -2157,7 +2127,7 @@
             });
             _getFilter.set(this, function () {
                 var _a, _b, _c, _d, _e, _f;
-                var _3 = _this.filterRegister.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
+                var _3 = _this.filterRegister.value.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
                 return {
                     rawColumnFilter: columnFilter || {},
                     rawExternalFilter: externalFilter || {},
@@ -2791,15 +2761,11 @@
                 _this.ref.detectChanges();
             });
             this.clearFilter = function () {
-                _this.filterRegister.remove();
-                // if (this.gridOption?.filter?.inlineColumn) {
-                //   this.columnFilter = {};
-                // }
-                // this.gridFilter?.onClearFilter();
+                _this.filterRegister.value.remove();
             };
             this.setFilter = function (args) {
                 var _3 = args || {}, columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
-                _this.filterRegister.set({
+                _this.filterRegister.value.set({
                     columnFilter: columnFilter,
                     externalFilter: externalFilter,
                     filterDef: filterDef
@@ -3755,7 +3721,7 @@
         { type: SdGridConfigurationService }
     ]; };
 
-    var _cache$2;
+    var _cache$3;
     var SdPopupGridConfiguration = /** @class */ (function () {
         function SdPopupGridConfiguration(ref, notifyService, translateService, gridConfigurationService) {
             var _this = this;
@@ -3764,7 +3730,7 @@
             this.translateService = translateService;
             this.gridConfigurationService = gridConfigurationService;
             this.changes = new core.EventEmitter();
-            _cache$2.set(this, void 0);
+            _cache$3.set(this, void 0);
             this.isCreatingColumn = false;
             this.selected = {};
             this.disabledDrag = true;
@@ -3773,9 +3739,9 @@
                 return __generator(this, function (_c) {
                     switch (_c.label) {
                         case 0:
-                            __classPrivateFieldSet(this, _cache$2, this.gridConfigurationService.init(this.key, this.gridOption));
+                            __classPrivateFieldSet(this, _cache$3, this.gridConfigurationService.init(this.key, this.gridOption));
                             _b = this;
-                            return [4 /*yield*/, __classPrivateFieldGet(this, _cache$2).get()];
+                            return [4 /*yield*/, __classPrivateFieldGet(this, _cache$3).get()];
                         case 1:
                             _b.configuration = _c.sent();
                             this.modal.open();
@@ -3784,7 +3750,7 @@
                 });
             }); };
             this.onSave = function () {
-                __classPrivateFieldGet(_this, _cache$2).set(_this.configuration);
+                __classPrivateFieldGet(_this, _cache$3).set(_this.configuration);
                 _this.modal.close();
                 _this.ref.detectChanges();
             };
@@ -3794,7 +3760,7 @@
                 return __generator(this, function (_b) {
                     translate = this.translateService.translate;
                     this.notifyService.confirm(translate('Reset grid configuration to default')).then(function () {
-                        __classPrivateFieldGet(_this, _cache$2).remove();
+                        __classPrivateFieldGet(_this, _cache$3).remove();
                         _this.modal.close();
                         _this.ref.detectChanges();
                     });
@@ -3826,7 +3792,7 @@
                         generatedColumns: this.configuration.columns.filter(function (e) { var _a; return _this.selected[(_a = e.origin) === null || _a === void 0 ? void 0 : _a.field]; }).map(function (e) { var _a; return (_a = e.origin) === null || _a === void 0 ? void 0 : _a.field; })
                     };
                     this.configuration.columns.push(generatedColumn);
-                    this.configuration = __classPrivateFieldGet(this, _cache$2).set(this.configuration);
+                    this.configuration = __classPrivateFieldGet(this, _cache$3).set(this.configuration);
                     this.isCreatingColumn = false;
                     return [2 /*return*/];
                 });
@@ -3849,7 +3815,7 @@
         };
         return SdPopupGridConfiguration;
     }());
-    _cache$2 = new WeakMap();
+    _cache$3 = new WeakMap();
     SdPopupGridConfiguration.decorators = [
         { type: core.Component, args: [{
                     selector: 'sd-popup-grid-configuration',
@@ -4137,12 +4103,12 @@
                 },] }
     ];
 
-    var _cache$3;
+    var _cache$4;
     var SdGeneratedColumnService = /** @class */ (function () {
         function SdGeneratedColumnService(settingService) {
             var _this = this;
             this.settingService = settingService;
-            _cache$3.set(this, {});
+            _cache$4.set(this, {});
             this.load = function (configuration) {
                 if (!(configuration === null || configuration === void 0 ? void 0 : configuration.key)) {
                     return null;
@@ -4151,22 +4117,22 @@
                     prefix: '260f5e94-5865-4425-8ced-b9c083c390dd',
                     key: configuration.key
                 });
-                if (!__classPrivateFieldGet(_this, _cache$3)[key]) {
+                if (!__classPrivateFieldGet(_this, _cache$4)[key]) {
                     if ((configuration === null || configuration === void 0 ? void 0 : configuration.storage) === 'server') {
-                        __classPrivateFieldGet(_this, _cache$3)[key] = _this.settingService.createServer(key, {
+                        __classPrivateFieldGet(_this, _cache$4)[key] = _this.settingService.createServer(key, {
                             args: configuration === null || configuration === void 0 ? void 0 : configuration.args,
                             default: []
                         });
                     }
                     else {
-                        __classPrivateFieldGet(_this, _cache$3)[key] = _this.settingService.create(key, {
+                        __classPrivateFieldGet(_this, _cache$4)[key] = _this.settingService.create(key, {
                             type: configuration === null || configuration === void 0 ? void 0 : configuration.storage,
                             args: configuration === null || configuration === void 0 ? void 0 : configuration.args,
                             default: []
                         });
                     }
                 }
-                return __classPrivateFieldGet(_this, _cache$3)[key];
+                return __classPrivateFieldGet(_this, _cache$4)[key];
             };
             this.loadSystem = function (configuration) {
                 var _a, _b;
@@ -4180,27 +4146,27 @@
                     prefix: '8b8050ca-1f44-4860-bad3-20e646c0d68f',
                     key: configuration.key
                 });
-                if (!__classPrivateFieldGet(_this, _cache$3)[key]) {
+                if (!__classPrivateFieldGet(_this, _cache$4)[key]) {
                     if ((configuration === null || configuration === void 0 ? void 0 : configuration.storage) === 'server') {
-                        __classPrivateFieldGet(_this, _cache$3)[key] = _this.settingService.createServer(key, {
+                        __classPrivateFieldGet(_this, _cache$4)[key] = _this.settingService.createServer(key, {
                             args: (_a = configuration === null || configuration === void 0 ? void 0 : configuration.systemColumn) === null || _a === void 0 ? void 0 : _a.args,
                             default: []
                         });
                     }
                     else {
-                        __classPrivateFieldGet(_this, _cache$3)[key] = _this.settingService.create(key, {
+                        __classPrivateFieldGet(_this, _cache$4)[key] = _this.settingService.create(key, {
                             type: configuration === null || configuration === void 0 ? void 0 : configuration.storage,
                             args: (_b = configuration === null || configuration === void 0 ? void 0 : configuration.systemColumn) === null || _b === void 0 ? void 0 : _b.args,
                             default: []
                         });
                     }
                 }
-                return __classPrivateFieldGet(_this, _cache$3)[key];
+                return __classPrivateFieldGet(_this, _cache$4)[key];
             };
         }
         return SdGeneratedColumnService;
     }());
-    _cache$3 = new WeakMap();
+    _cache$4 = new WeakMap();
     SdGeneratedColumnService.decorators = [
         { type: core.Injectable }
     ];