@firestitch/filter 9.9.0 → 9.9.5

package/app/models/items/base-item.d.ts

@@ -16,7 +16,6 @@ export declare abstract class BaseItem<T extends IFilterConfigBaseItem> {
     change: (item: BaseItem<T>) => void;
     protected readonly _type: T['type'];
     protected _model: any;
-    protected _initialized: boolean;
     protected _pendingValues: boolean;
     protected _pendingDefaultValue: boolean;
     protected _loading$: BehaviorSubject<boolean>;
@@ -56,6 +55,7 @@ export declare abstract class BaseItem<T extends IFilterConfigBaseItem> {
     get loading$(): Observable<boolean>;
     get loading(): boolean;
     set loading(value: boolean);
+    protected get _initialized(): boolean;
     valueChanged(): void;
     get queryObject(): Record<string, unknown>;
     get persistanceObject(): Record<string, unknown>;

package/bundles/firestitch-filter.umd.js

@@ -254,7 +254,7 @@
     var BaseItem = /** @class */ (function () {
         function BaseItem(itemConfig, _additionalConfig) {
             this._additionalConfig = _additionalConfig;
-            this._initialized = false;
+            // protected _initialized = false;
             this._pendingValues = false;
             this._pendingDefaultValue = false;
             this._loading$ = new rxjs.BehaviorSubject(false);
@@ -453,6 +453,13 @@
             enumerable: true,
             configurable: true
         });
+        Object.defineProperty(BaseItem.prototype, "_initialized", {
+            get: function () {
+                return !this._pendingDefaultValue && !this._pendingValues;
+            },
+            enumerable: true,
+            configurable: true
+        });
         BaseItem.prototype.valueChanged = function () {
             this._value$.next(this.value);
             if (this.change) {
@@ -487,15 +494,17 @@
         });
         BaseItem.prototype.loadDefaultValue = function () {
             var _this = this;
+            this._pendingDefaultValue = true;
             return this.defaultValueFn()
                 .pipe(operators.tap(function (value) {
                 _this.defaultValue = value;
+                _this._initDefaultModel();
             }), operators.finalize(function () {
                 _this._pendingDefaultValue = false;
             }));
         };
         BaseItem.prototype.initValues = function (persistedValue) {
-            this._initialized = false;
+            // this._initialized = false;
             this.persistedValue = persistedValue;
             this._initDefaultModel();
             var isAutocomplete = this.type === exports.ItemType.AutoComplete || this.type === exports.ItemType.AutoCompleteChips;
@@ -508,12 +517,12 @@
                     this.values = valuesResult;
                     // Move to some other place
                     this._init();
-                    this._initialized = true;
+                    // this._initialized = true;
                 }
             }
             else {
                 this._init();
-                this._initialized = true;
+                // this._initialized = true;
             }
         };
         BaseItem.prototype.loadAsyncValues = function (reload) {
@@ -529,7 +538,7 @@
                     _this.loading = false;
                     _this._init();
                     _this._validateModel();
-                    _this._initialized = true;
+                    // this._initialized = true;
                 });
             }
         };
@@ -558,7 +567,6 @@
             this.label = item.label;
             this.chipLabel = item.chipLabel;
             if (typeof item.default === 'function') {
-                this._pendingDefaultValue = true;
                 this.defaultValueFn = item.default;
             }
             else {
@@ -1861,7 +1869,7 @@
             var _this = this;
             var pendingItems = this.items
                 .filter(function (item) {
-                return item.hasPendingDefaultValue
+                return item.defaultValueFn
                     && (item.persistedValue === null || item.persistedValue === undefined);
             });
             if (pendingItems.length > 0) {
@@ -2684,6 +2692,12 @@
         };
         ExternalParamsController.prototype._listenItemsChange = function () {
             var _this = this;
+            this._itemsStore.ready$
+                .pipe(operators.filter(function (v) { return v; }), operators.take(1), operators.takeUntil(this._destroy$))
+                .subscribe(function () {
+                _this._saveQueryParams();
+                _this._savePersistedParams();
+            });
             this._itemsStore
                 .itemsChange$
                 .pipe(operators.takeUntil(this._destroy$))
@@ -5159,7 +5173,7 @@
         FsFilterActionKebabActionsComponent = __decorate([
             core.Component({
                 selector: 'fs-filter-action-kebab-actions',
-                template: "<button type=\"button\"\n        mat-icon-button\n        class=\"menu-button\"\n        [fsMenuTriggerFor]=\"kebabActionsMenu\">\n  <mat-icon>more_vert</mat-icon>\n</button>\n<fs-menu #kebabActionsMenu>\n  <ng-container *ngFor=\"let action of kebabActions\">\n    <ng-container [ngSwitch]=\"action.mode\">\n      <!-- Case when actions was collapsed from action with mode = 'menu'-->\n      <ng-container *ngSwitchCase=\"'menu'\">\n        <ng-container *ngFor=\"let childAction of action.items\">\n          <ng-container *ngIf=\"childAction.isGroup else simpleMenuItem\">\n            <fs-menu-group>\n              <ng-template fs-group-menu-item-template>\n                {{ action.label }} <mat-icon style=\"margin: 0;\">arrow_right</mat-icon> {{childAction.label}}\n              </ng-template>\n              <ng-container *ngFor=\"let subAction of childAction.items\">\n                <ng-template fs-menu-item\n                             [link]=\"subAction.routerLink?.link\"\n                             [queryParams]=\"subAction.routerLink?.queryParams\"\n                             [hidden]=\"!(subAction.visible$ | async)\"\n                             (click)=\"subAction.click($event)\">\n                  <mat-icon *ngIf=\"subAction.icon\">{{subAction.icon}}</mat-icon>\n                  {{subAction.label}}\n                </ng-template>\n              </ng-container>\n            </fs-menu-group>\n          </ng-container>\n          <ng-template #simpleMenuItem>\n            <ng-template fs-menu-item\n                         [link]=\"childAction.routerLink?.link\"\n                         [queryParams]=\"childAction.routerLink?.queryParams\"\n                         [hidden]=\"!(childAction.visible$ | async)\"\n                         (click)=\"childAction.click($event);\">\n              <mat-icon *ngIf=\"childAction.icon\">{{childAction.icon}}</mat-icon>\n             {{ action.label }} <mat-icon style=\"margin: 0;\">arrow_right</mat-icon>{{ childAction.label }}\n            </ng-template>\n          </ng-template>\n        </ng-container>\n      </ng-container>\n\n      <ng-container *ngSwitchDefault>\n        <ng-template fs-menu-item\n                     (click)=\"action.click($event)\"\n                     [fsClass]=\"action.classArray\"\n        >\n          <mat-icon *ngIf=\"action.icon\">{{action.icon}}</mat-icon> {{action.label}}\n        </ng-template>\n      </ng-container>\n\n    </ng-container>\n  </ng-container>\n</fs-menu>\n",
+                template: "<button type=\"button\"\n        mat-icon-button\n        class=\"menu-button\"\n        [fsMenuTriggerFor]=\"kebabActionsMenu\">\n  <mat-icon>more_vert</mat-icon>\n</button>\n<fs-menu #kebabActionsMenu>\n  <ng-container *ngFor=\"let action of kebabActions\">\n    <ng-container [ngSwitch]=\"action.mode\">\n      <!-- Case when actions was collapsed from action with mode = 'menu'-->\n      <ng-container *ngSwitchCase=\"'menu'\">\n        <ng-container *ngFor=\"let childAction of action.items\">\n          <ng-container *ngIf=\"childAction.isGroup else simpleMenuItem\">\n            <fs-menu-group>\n              <ng-template fs-group-menu-item-template>\n                {{ action.label }} <mat-icon style=\"margin: 0;\">arrow_right</mat-icon> {{childAction.label}}\n              </ng-template>\n              <ng-container *ngFor=\"let subAction of childAction.items\">\n                <ng-template fs-menu-item\n                             [link]=\"subAction.routerLink?.link\"\n                             [queryParams]=\"subAction.routerLink?.queryParams\"\n                             [hidden]=\"!(subAction.visible$ | async)\"\n                             (click)=\"subAction.click($event)\">\n                  <mat-icon *ngIf=\"subAction.icon\">{{subAction.icon}}</mat-icon>\n                  {{subAction.label}}\n                </ng-template>\n              </ng-container>\n            </fs-menu-group>\n          </ng-container>\n          <ng-template #simpleMenuItem>\n            <ng-template fs-menu-item\n                         [link]=\"childAction.routerLink?.link\"\n                         [queryParams]=\"childAction.routerLink?.queryParams\"\n                         [hidden]=\"!(childAction.visible$ | async)\"\n                         (click)=\"childAction.click($event);\">\n              <mat-icon *ngIf=\"childAction.icon\">{{childAction.icon}}</mat-icon>\n             {{ action.label }} <mat-icon style=\"margin: 0;\">arrow_right</mat-icon>{{ childAction.label }}\n            </ng-template>\n          </ng-template>\n        </ng-container>\n      </ng-container>\n\n      <ng-container *ngSwitchCase=\"'file'\">\n        <ng-template fs-menu-item\n                     [fsClass]=\"action.classArray\"\n        >\n          <fs-file\n            class=\"action-button\"\n            [multiple]=\"action.multiple\"\n            (select)=\"action.fileSelected($event)\"\n            (error)=\"action.fileError($event)\"\n            (clicked)=\"action.click($event)\">\n            <mat-icon *ngIf=\"action.icon\">{{action.icon}}</mat-icon> {{action.label}}\n          </fs-file>\n        </ng-template>\n      </ng-container>\n\n      <ng-container *ngSwitchDefault>\n        <ng-template fs-menu-item\n                     (click)=\"action.click($event)\"\n                     [fsClass]=\"action.classArray\"\n        >\n          <mat-icon *ngIf=\"action.icon\">{{action.icon}}</mat-icon> {{action.label}}\n        </ng-template>\n      </ng-container>\n\n    </ng-container>\n  </ng-container>\n</fs-menu>\n",
                 changeDetection: core.ChangeDetectionStrategy.OnPush,
                 styles: [".menu-button{width:36px;height:36px;line-height:36px}"]
             })