@kuzntsv/uikit 1.0.62 → 1.0.63

package/fesm2022/kuzntsv-uikit-ui.mjs

@@ -1,5 +1,5 @@
 import * as i0 from "@angular/core";
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Directive, ElementRef, HostListener, Injectable, InjectionToken, Injector, NgZone, Pipe, computed, effect, inject, input, linkedSignal, makeEnvironmentProviders, model, output, runInInjectionContext, signal, viewChild } from "@angular/core";
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Directive, ElementRef, HostListener, Injectable, InjectionToken, Injector, NgZone, Pipe, computed, effect, inject, input, linkedSignal, makeEnvironmentProviders, model, output, signal, viewChild } from "@angular/core";
 import { Router, RouterLink } from "@angular/router";
 import { ReplaySubject, Subject, Subscription, filter, finalize, forkJoin, map, of, startWith, switchMap, take, tap } from "rxjs";
 import { API_NAME, AuthService, HIDE_ROLE_MARKER, NotificationService, RoleService, UIKIT_NOTIFICATION_TOKEN } from "@kuzntsv/uikit";
@@ -2763,23 +2763,16 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 	hideRoles = [HIDE_ROLE_MARKER];
 	allowMultiSelect = false;
 	selected = [];
-	dataResource = computed(() => {
-		const currentState = this.tableState();
-		const currentFilters = this.filters();
-		return runInInjectionContext(this.injector, () => this.fnGetData(currentState, currentFilters));
-	}, ...ngDevMode ? [{ debugName: "dataResource" }] : /* istanbul ignore next */ []);
-	countResource = computed(() => {
-		const currentFilters = this.filters();
-		return runInInjectionContext(this.injector, () => this.fnGetCount(currentFilters));
-	}, ...ngDevMode ? [{ debugName: "countResource" }] : /* istanbul ignore next */ []);
+	dataResource;
+	countResource;
 	data = computed(() => {
-		const rawData = this.dataResource()?.value() || [];
+		const rawData = this.dataResource?.value() || [];
 		return this.fnMapEntity && Array.isArray(rawData) ? rawData.map(this.fnMapEntity()) : rawData;
 	}, ...ngDevMode ? [{ debugName: "data" }] : /* istanbul ignore next */ []);
-	length = computed(() => this.countResource()?.value() || 0, ...ngDevMode ? [{ debugName: "length" }] : /* istanbul ignore next */ []);
+	length = computed(() => this.countResource?.value() || 0, ...ngDevMode ? [{ debugName: "length" }] : /* istanbul ignore next */ []);
 	isLoading = computed(() => {
-		const dataLoading = this.dataResource()?.isLoading() ?? false;
-		const countLoading = this.countResource()?.isLoading() ?? false;
+		const dataLoading = this.dataResource?.isLoading() ?? false;
+		const countLoading = this.countResource?.isLoading() ?? false;
 		return dataLoading || countLoading;
 	}, ...ngDevMode ? [{ debugName: "isLoading" }] : /* istanbul ignore next */ []);
 	editBtnDisabled = true;
@@ -2874,6 +2867,8 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 			if (filterChanged) {}
 			previousFilters = { ...currentFilters };
 		});
+		this.dataResource = this.initDataResource();
+		this.countResource = this.initCountResource();
 	}
 	ngOnDestroy() {
 		this.subscription.unsubscribe();
@@ -3043,8 +3038,8 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 		}
 	}
 	refreshEvent() {
-		this.dataResource()?.reload();
-		this.countResource()?.reload();
+		this.dataResource?.reload();
+		this.countResource?.reload();
 	}
 	onRemovalMessageChange(message) {
 		this.removalMessage = message;
@@ -3180,9 +3175,10 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 			parse: (data) => z.coerce.number().parse(data)
 		});
 	}
-	getObjectsByPaging(tableState) {
+	getObjectsByPaging(tableStateGetter) {
 		return httpResource(() => {
 			this._refreshTrigger();
+			const tableState = tableStateGetter();
 			return {
 				url: this.baseRoute,
 				params: this.buildTableParams(tableState)
@@ -3196,10 +3192,11 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 			}
 		});
 	}
-	getObjectsByFilterPaging(tableState, filters) {
+	getObjectsByFilterPaging(tableStateGetter, filtersGetter) {
 		return httpResource(() => {
 			this._refreshTrigger();
-			const cleanFields = cleanFilterParams(filters);
+			const tableState = tableStateGetter();
+			const cleanFields = cleanFilterParams(filtersGetter());
 			const tableParams = this.buildTableParams(tableState);
 			return {
 				url: this.baseRoute,
@@ -3217,10 +3214,10 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 			}
 		});
 	}
-	getObjectsCountByFilter(filters) {
+	getObjectsCountByFilter(filtersGetter) {
 		return httpResource(() => {
 			this._refreshTrigger();
-			const cleanFields = cleanFilterParams(filters);
+			const cleanFields = cleanFilterParams(filtersGetter());
 			return {
 				url: `${this.baseRoute}${this.countRoute}`,
 				params: { ...cleanFields }