@kuzntsv/uikit 1.0.58 → 1.0.60

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, 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";
@@ -2736,7 +2736,6 @@ i0.ɵɵngDeclareClassMetadata({
 });
 var BaseSignalPageClass = class BaseSignalPageClass {
 	dialog = inject(MatDialog);
-	injector = inject(Injector);
 	entityService;
 	entityEditComponent;
 	extraData;
@@ -2763,27 +2762,18 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 	hideRoles = [HIDE_ROLE_MARKER];
 	allowMultiSelect = false;
 	selected = [];
-	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 = computed(() => {
-		const fetchFn = this.fnGetData();
-		if (!fetchFn) return null;
 		this.tableState();
 		this.filters();
-		return runInInjectionContext(this.componentInjector || this.injector, () => fetchFn());
+		return this.fnGetData();
 	}, ...ngDevMode ? [{ debugName: "dataResource" }] : /* istanbul ignore next */ []);
 	countResource = computed(() => {
-		const fetchCountFn = this.fnGetCount();
-		if (!fetchCountFn) return null;
 		this.filters();
-		return runInInjectionContext(this.componentInjector || this.injector, () => fetchCountFn());
+		return this.fnGetCount();
 	}, ...ngDevMode ? [{ debugName: "countResource" }] : /* istanbul ignore next */ []);
 	data = computed(() => {
 		const rawData = this.dataResource()?.value() || [];
-		const mapFn = this.fnMapEntity();
-		if (mapFn && Array.isArray(rawData)) return rawData.map(mapFn());
-		return rawData;
+		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 */ []);
 	isLoading = computed(() => {
@@ -2791,7 +2781,6 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 		const countLoading = this.countResource()?.isLoading() ?? false;
 		return dataLoading || countLoading;
 	}, ...ngDevMode ? [{ debugName: "isLoading" }] : /* istanbul ignore next */ []);
-	componentInjector = null;
 	editBtnDisabled = true;
 	removeBtnDisabled = true;
 	dblClickedEventEnable = true;
@@ -2820,28 +2809,6 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 		});
 		const validation = this.filterSchema.safeParse(initial);
 		this.filters.set(validation.success ? validation.data : this.defaultFilters);
-		this.trackFilterChanges();
-	}
-	trackFilterChanges() {
-		if (!this.defaultFilters) return;
-		let previousFilters = { ...this.filters() };
-		effect(() => {
-			const currentFilters = this.filters();
-			const prefix = this.storagePrefix;
-			let filterChanged = false;
-			Object.keys(currentFilters).forEach((key) => {
-				const prevVal = previousFilters[key];
-				const currVal = currentFilters[key];
-				if (prevVal !== currVal) {
-					filterChanged = true;
-					const storageKey = `${prefix}${String(key)}`;
-					if (currVal === null || currVal === void 0 || currVal === "" || currVal === 0 || currVal === -1 || Array.isArray(currVal) && currVal.length === 0) localStorage.removeItem(storageKey);
-					else this.localStorageService.saveData(storageKey, JSON.stringify(currVal));
-				}
-			});
-			if (filterChanged) {}
-			previousFilters = { ...currentFilters };
-		});
 	}
 	clearEvent() {
 		if (!this.defaultFilters) return;
@@ -2888,16 +2855,28 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 			if (this.isLoading()) this.loaderService.show();
 			else this.loaderService.hide();
 		});
+		let previousFilters = { ...this.filters() };
+		effect(() => {
+			const currentFilters = this.filters();
+			const prefix = this.storagePrefix;
+			let filterChanged = false;
+			Object.keys(currentFilters).forEach((key) => {
+				const prevVal = previousFilters[key];
+				const currVal = currentFilters[key];
+				if (prevVal !== currVal) {
+					filterChanged = true;
+					const storageKey = `${prefix}${String(key)}`;
+					if (currVal === null || currVal === void 0 || currVal === "" || currVal === 0 || currVal === -1 || Array.isArray(currVal) && currVal.length === 0) localStorage.removeItem(storageKey);
+					else this.localStorageService.saveData(storageKey, JSON.stringify(currVal));
+				}
+			});
+			if (filterChanged) {}
+			previousFilters = { ...currentFilters };
+		});
 	}
 	ngOnDestroy() {
 		this.subscription.unsubscribe();
 	}
-	subscribeToLoadData(fnGetData, fnGetCount, fnMapEntity, injector) {
-		if (injector) this.componentInjector = injector;
-		this.fnMapEntity.set(fnMapEntity);
-		this.fnGetData.set(fnGetData);
-		this.fnGetCount.set(fnGetCount);
-	}
 	setFilter(key, value) {
 		const storageKey = `${this.constructor.name}_Filter_${String(key)}`;
 		this.tableState.update((prev) => ({
@@ -3200,17 +3179,12 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 			parse: (data) => z.coerce.number().parse(data)
 		});
 	}
-	getObjectsByPaging(pageIndex, pageSize, sortColumn, direction) {
+	getObjectsByPaging(tableState) {
 		return httpResource(() => {
 			this._refreshTrigger();
-			const queryParams = {};
-			if (pageIndex + 1) queryParams[this.pageIndexParam] = pageIndex + 1;
-			if (pageSize) queryParams[this.pageSizeParam] = pageSize;
-			if (sortColumn) queryParams[this.sortColumnParam] = sortColumn;
-			if (direction) queryParams[this.directionParam] = direction;
 			return {
 				url: this.baseRoute,
-				params: queryParams
+				params: this.buildTableParams(tableState)
 			};
 		}, {
 			...this.getHttpContext(),
@@ -3221,17 +3195,17 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 			}
 		});
 	}
-	getObjectsByFilterPaging(pageIndex, pageSize, sortColumn, direction, filters) {
+	getObjectsByFilterPaging(tableState, filters) {
 		return httpResource(() => {
 			this._refreshTrigger();
-			const queryParams = { ...cleanFilterParams(filters) };
-			if (pageIndex + 1) queryParams[this.pageIndexParam] = pageIndex + 1;
-			if (pageSize) queryParams[this.pageSizeParam] = pageSize;
-			if (sortColumn) queryParams[this.sortColumnParam] = sortColumn;
-			if (direction) queryParams[this.directionParam] = direction;
+			const cleanFields = cleanFilterParams(filters);
+			const tableParams = this.buildTableParams(tableState);
 			return {
 				url: this.baseRoute,
-				params: queryParams
+				params: {
+					...cleanFields,
+					...tableParams
+				}
 			};
 		}, {
 			...this.getHttpContext(),
@@ -3256,6 +3230,15 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 			parse: (data) => z.coerce.number().parse(data)
 		});
 	}
+	buildTableParams(tableState) {
+		const queryParams = {};
+		const { pageIndex, pageSize, sortActive, sortDirection } = tableState;
+		if (pageIndex + 1) queryParams[this.pageIndexParam] = pageIndex + 1;
+		if (pageSize) queryParams[this.pageSizeParam] = pageSize;
+		if (sortActive) queryParams[this.sortColumnParam] = sortActive;
+		if (sortDirection) queryParams[this.directionParam] = sortDirection;
+		return queryParams;
+	}
 	newObject(entity) {
 		return this.http.post(this.baseRoute, entity, this.getHttpContext());
 	}
@@ -4388,6 +4371,16 @@ i0.ɵɵngDeclareClassMetadata({
 		}]
 	}
 });
+const SortDirectionSchema = z.custom((val) => val === "asc" || val === "desc" || val === "", { message: "Допустимы только значения 'asc', 'desc' или ''" });
+const SortStateSchema = z.object({
+	sortActive: z.string(),
+	sortDirection: SortDirectionSchema
+});
+const PageStateSchema = z.object({
+	pageIndex: z.number().int().min(0),
+	pageSize: z.number().int().positive()
+});
+const TableStateSchema = SortStateSchema.merge(PageStateSchema);
 var TableComponent = class TableComponent {
 	data = input([], ...ngDevMode ? [{ debugName: "data" }] : /* istanbul ignore next */ []);
 	length = input(0, ...ngDevMode ? [{ debugName: "length" }] : /* istanbul ignore next */ []);
@@ -5648,6 +5641,6 @@ const secUserSchema = z.object({
 	tabnum: z.number().default(0),
 	userView: secUserViewSchema.optional()
 });
-export { Action, AvatarService, BaseEditClass, BaseFilterClass, BaseMatChipComponent, BaseNavBarMenuClass, BasePageClass, BaseSchema, BaseSelectAutocompleteWithVsComponent, BaseSelectWithGroupComponent, BaseServiceClass, BaseSignalEditClass, BaseSignalFilterClass, BaseSignalPageClass, BaseSignalServiceClass, BaseToolbarComponent, CustomDateAdapter, DateRangeInputComponent, DialogAction, DialogComponent, DisableIfRoleDirective, EmptyComponent, EntityAction, ExportService, HideIfForbiddenRoleDirective, LOGGER_CONFIG, LoaderService, LocalStorageService, LoggerService, LoginPageComponent, MY_NATIVE_FORMATS, NavBarComponent, NotFoundComponent, ProgressSpinnerComponent, SafePipe, SecureImageService, SetValueDirective, SseService, TableComponent, TimePipe, TruncatePipe, authGuard, dateFormat, provideLogger, redirectGuard, roleGuard, secUserSchema };
+export { Action, AvatarService, BaseEditClass, BaseFilterClass, BaseMatChipComponent, BaseNavBarMenuClass, BasePageClass, BaseSchema, BaseSelectAutocompleteWithVsComponent, BaseSelectWithGroupComponent, BaseServiceClass, BaseSignalEditClass, BaseSignalFilterClass, BaseSignalPageClass, BaseSignalServiceClass, BaseToolbarComponent, CustomDateAdapter, DateRangeInputComponent, DialogAction, DialogComponent, DisableIfRoleDirective, EmptyComponent, EntityAction, ExportService, HideIfForbiddenRoleDirective, LOGGER_CONFIG, LoaderService, LocalStorageService, LoggerService, LoginPageComponent, MY_NATIVE_FORMATS, NavBarComponent, NotFoundComponent, PageStateSchema, ProgressSpinnerComponent, SafePipe, SecureImageService, SetValueDirective, SortDirectionSchema, SortStateSchema, SseService, TableComponent, TableStateSchema, TimePipe, TruncatePipe, authGuard, dateFormat, provideLogger, redirectGuard, roleGuard, secUserSchema };
 
 //# sourceMappingURL=kuzntsv-uikit-ui.mjs.map