@kuzntsv/uikit 1.0.35 → 1.0.37

package/fesm2022/kuzntsv-uikit-ui.mjs

@@ -1,7 +1,7 @@
 import * as i0 from "@angular/core";
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Directive, ElementRef, HostListener, Injectable, InjectionToken, NgZone, Pipe, computed, effect, inject, input, linkedSignal, makeEnvironmentProviders, 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 { ReplaySubject, Subject, Subscription, filter, finalize, forkJoin, map, of, startWith, take } from "rxjs";
 import { API_NAME, AuthService, HIDE_ROLE_MARKER, NotificationService, RoleService, UIKIT_NOTIFICATION_TOKEN } from "@kuzntsv/uikit";
 import * as i1$1 from "@angular/forms";
 import { FormControl, FormGroup, FormsModule, NgControl, ReactiveFormsModule, Validators } from "@angular/forms";
@@ -28,6 +28,7 @@ import { MatTooltip, MatTooltipModule } from "@angular/material/tooltip";
 import { MatDivider } from "@angular/material/divider";
 import { MatMenu, MatMenuContent, MatMenuItem, MatMenuTrigger } from "@angular/material/menu";
 import { MatToolbar } from "@angular/material/toolbar";
+import { rxResource } from "@angular/core/rxjs-interop";
 import { DomSanitizer } from "@angular/platform-browser";
 import { MatProgressSpinner } from "@angular/material/progress-spinner";
 import * as i3 from "@angular/cdk/scrolling";
@@ -2087,10 +2088,11 @@ var EntityAction;
 	EntityAction["Delete"] = "Удаление";
 })(EntityAction || (EntityAction = {}));
 var BaseFilterClass = class BaseFilterClass {
-	localStorageService = inject(LocalStorageService);
 	loaderService = inject(LoaderService);
 	notificationService = inject(NotificationService);
 	defaultDebounceTime = 500;
+	filters = input({}, ...ngDevMode ? [{ debugName: "filters" }] : /* istanbul ignore next */ []);
+	clearFilters = input(null, ...ngDevMode ? [{ debugName: "clearFilters" }] : /* istanbul ignore next */ []);
 	subscription = new Subscription();
 	constructor() {}
 	ngOnDestroy() {
@@ -2105,10 +2107,26 @@ var BaseFilterClass = class BaseFilterClass {
 		target: i0.ɵɵFactoryTarget.Directive
 	});
 	static ɵdir = i0.ɵɵngDeclareDirective({
-		minVersion: "14.0.0",
+		minVersion: "17.1.0",
 		version: "22.2.2",
 		type: BaseFilterClass,
 		isStandalone: true,
+		inputs: {
+			filters: {
+				classPropertyName: "filters",
+				publicName: "filters",
+				isSignal: true,
+				isRequired: false,
+				transformFunction: null
+			},
+			clearFilters: {
+				classPropertyName: "clearFilters",
+				publicName: "clearFilters",
+				isSignal: true,
+				isRequired: false,
+				transformFunction: null
+			}
+		},
 		ngImport: i0
 	});
 };
@@ -2118,7 +2136,25 @@ i0.ɵɵngDeclareClassMetadata({
 	ngImport: i0,
 	type: BaseFilterClass,
 	decorators: [{ type: Directive }],
-	ctorParameters: () => []
+	ctorParameters: () => [],
+	propDecorators: {
+		filters: [{
+			type: i0.Input,
+			args: [{
+				isSignal: true,
+				alias: "filters",
+				required: false
+			}]
+		}],
+		clearFilters: [{
+			type: i0.Input,
+			args: [{
+				isSignal: true,
+				alias: "clearFilters",
+				required: false
+			}]
+		}]
+	}
 });
 var BaseNavBarMenuClass = class BaseNavBarMenuClass {
 	roleService = inject(RoleService);
@@ -2202,8 +2238,6 @@ i0.ɵɵngDeclareClassMetadata({
 });
 var BasePageClass = class BasePageClass {
 	dialog = inject(MatDialog);
-	data = signal([], ...ngDevMode ? [{ debugName: "data" }] : /* istanbul ignore next */ []);
-	length = signal(0, ...ngDevMode ? [{ debugName: "length" }] : /* istanbul ignore next */ []);
 	entityService;
 	entityType;
 	entityEditComponent;
@@ -2226,11 +2260,46 @@ var BasePageClass = class BasePageClass {
 	hideRoles = [HIDE_ROLE_MARKER];
 	loadData$ = new Subject();
 	loadLength$ = new Subject();
-	clearFilter$ = new Subject();
-	clearFilter = null;
+	clearFilters = signal(null, ...ngDevMode ? [{ debugName: "clearFilters" }] : /* istanbul ignore next */ []);
 	allowMultiSelect = false;
 	selected = [];
-	tableState;
+	fnGetData = signal(null, ...ngDevMode ? [{ debugName: "fnGetData" }] : /* istanbul ignore next */ []);
+	fnGetCount = signal(null, ...ngDevMode ? [{ debugName: "fnGetCount" }] : /* istanbul ignore next */ []);
+	fnMapEntity = signal(void 0, ...ngDevMode ? [{ debugName: "fnMapEntity" }] : /* istanbul ignore next */ []);
+	dataResource = rxResource({
+		params: () => {
+			const fetchFn = this.fnGetData();
+			if (!fetchFn) return null;
+			return {
+				fetchFn,
+				state: this.tableState(),
+				mapFn: this.fnMapEntity()
+			};
+		},
+		stream: ({ params, abortSignal }) => {
+			if (!params) return of([]);
+			this.loaderService.show();
+			return params.fetchFn().pipe(map((v) => params.mapFn && Array.isArray(v) ? v.map(params.mapFn()) : v), finalize(() => {
+				this.loaderService.hide();
+			}));
+		}
+	});
+	countResource = rxResource({
+		params: () => {
+			const fetchCountFn = this.fnGetCount();
+			if (!fetchCountFn) return null;
+			return {
+				fetchCountFn,
+				state: this.tableState()
+			};
+		},
+		stream: ({ params }) => {
+			if (!params) return of(0);
+			return params.fetchCountFn();
+		}
+	});
+	data = computed(() => this.dataResource.value() || [], ...ngDevMode ? [{ debugName: "data" }] : /* istanbul ignore next */ []);
+	length = computed(() => this.countResource.value() || 0, ...ngDevMode ? [{ debugName: "length" }] : /* istanbul ignore next */ []);
 	editBtnDisabled = true;
 	removeBtnDisabled = true;
 	dblClickedEventEnable = true;
@@ -2240,59 +2309,62 @@ var BasePageClass = class BasePageClass {
 	loaderService = inject(LoaderService);
 	notificationService = inject(UIKIT_NOTIFICATION_TOKEN);
 	subscription = new Subscription();
+	filters = signal(() => {
+		const saved = this.localStorageService.getData(this.constructor.name + "_Filters");
+		return saved ? JSON.parse(saved) : {};
+	}, ...ngDevMode ? [{ debugName: "filters" }] : /* istanbul ignore next */ []);
+	tableState = signal({
+		sortActive: "",
+		sortDirection: "",
+		pageIndex: this.defaultPageIndex,
+		pageSize: this.defaultPageSize
+	}, ...ngDevMode ? [{ debugName: "tableState" }] : /* istanbul ignore next */ []);
 	constructor() {
-		this.tableState = {
+		this.tableState.set({
 			sortActive: this.localStorageService.getData(this.constructor.name + "SortActive") || "",
 			sortDirection: this.localStorageService.getData(this.constructor.name + "SortDirection") || "",
 			pageIndex: Number(this.localStorageService.getData(this.constructor.name + "PageIndex")) || this.defaultPageIndex,
 			pageSize: Number(this.localStorageService.getData(this.constructor.name + "PageSize")) || this.defaultPageSize
-		};
+		});
 	}
 	ngOnDestroy() {
 		this.subscription.unsubscribe();
 	}
 	subscribeToLoadData(fnGetData, fnGetCount, fnMapEntity) {
-		const subs = this.loadData$.pipe(tap(() => this.loaderService.show()), switchMap(() => fnGetData()), map((v) => fnMapEntity && Array.isArray(v) ? v.map(fnMapEntity()) : v)).subscribe({
-			next: (response) => {
-				this.data.set(response || []);
-				this.loaderService.hide();
-			},
-			error: (error) => {
-				this.loaderService.hide();
-				console.log(error);
-				const errorMessage = error.message || error;
-				this.notificationService?.error("Произошла ошибка: " + errorMessage, 0);
-			}
+		this.fnMapEntity.set(fnMapEntity);
+		this.fnGetData.set(fnGetData);
+		this.fnGetCount.set(fnGetCount);
+	}
+	setFilter(key, value) {
+		this.filters.update((prev) => {
+			const next = { ...prev };
+			if (value === null || value === void 0 || value === "" || value === "-1") delete next[key];
+			else next[key] = value;
+			this.localStorageService.saveData(this.constructor.name + "_Filters", JSON.stringify(next));
+			return next;
 		});
-		this.subscription?.add(subs);
-		const subs2 = this.loadLength$.pipe(switchMap(() => fnGetCount())).subscribe({
-			next: (response) => {
-				this.length.set(response);
-			},
-			error: (error) => {
-				console.log(error);
-				this.notificationService.error("Произошла ошибка: " + error, 0);
-			}
-		});
-		this.subscription?.add(subs2);
-		this.loadData$.next(null);
-		this.loadLength$.next(null);
+		this.tableState.update((prev) => ({
+			...prev,
+			pageIndex: 0
+		}));
 	}
 	onPageChange(pageState) {
-		this.tableState.pageIndex = pageState.pageIndex;
-		this.tableState.pageSize = pageState.pageSize;
 		this.localStorageService.saveData(this.constructor.name + "PageIndex", pageState.pageIndex.toString());
 		this.localStorageService.saveData(this.constructor.name + "PageSize", pageState.pageSize.toString());
-		this.loadData$.next(null);
-		this.loadLength$.next(null);
+		this.tableState.update((prev) => ({
+			...prev,
+			pageIndex: pageState.pageIndex,
+			pageSize: pageState.pageSize
+		}));
 	}
 	onSortChange(sortState) {
-		this.tableState.sortActive = sortState.sortActive;
-		this.tableState.sortDirection = sortState.sortDirection;
 		this.localStorageService.saveData(this.constructor.name + "SortActive", sortState.sortActive);
 		this.localStorageService.saveData(this.constructor.name + "SortDirection", sortState.sortDirection);
-		this.loadData$.next(null);
-		this.loadLength$.next(null);
+		this.tableState.update((prev) => ({
+			...prev,
+			sortActive: sortState.sortActive,
+			sortDirection: sortState.sortDirection
+		}));
 	}
 	entityFactory(type) {
 		return new type();
@@ -2421,12 +2493,17 @@ var BasePageClass = class BasePageClass {
 		}
 	}
 	refreshEvent() {
-		this.loadData$.next(null);
-		this.loadLength$.next(null);
+		this.dataResource.reload();
+		this.countResource.reload();
 	}
 	clearEvent() {
-		this.clearFilter$.next(null);
-		this.clearFilter = {};
+		this.filters.set({});
+		this.localStorageService.saveData(this.constructor.name + "_Filters", "{}");
+		this.tableState.update((prev) => ({
+			...prev,
+			pageIndex: 0
+		}));
+		this.clearFilters.set({});
 	}
 	onRemovalMessageChange(message) {
 		this.removalMessage = message;