@kuzntsv/uikit 1.0.59 → 1.0.61

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, NgZone, Pipe, computed, effect, inject, input, linkedSignal, makeEnvironmentProviders, model, output, 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, runInInjectionContext, 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,6 +2736,7 @@ i0.ɵɵngDeclareClassMetadata({
 });
 var BaseSignalPageClass = class BaseSignalPageClass {
 	dialog = inject(MatDialog);
+	injector = inject(Injector);
 	entityService;
 	entityEditComponent;
 	extraData;
@@ -2763,13 +2764,13 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 	allowMultiSelect = false;
 	selected = [];
 	dataResource = computed(() => {
-		this.tableState();
-		this.filters();
-		return this.fnGetData();
+		const currentState = this.tableState();
+		const currentFilters = this.filters();
+		return runInInjectionContext(this.injector, () => this.fnGetData(currentState, currentFilters));
 	}, ...ngDevMode ? [{ debugName: "dataResource" }] : /* istanbul ignore next */ []);
 	countResource = computed(() => {
-		this.filters();
-		return this.fnGetCount();
+		const currentFilters = this.filters();
+		return runInInjectionContext(this.injector, () => this.fnGetCount(currentFilters));
 	}, ...ngDevMode ? [{ debugName: "countResource" }] : /* istanbul ignore next */ []);
 	data = computed(() => {
 		const rawData = this.dataResource()?.value() || [];
@@ -3179,17 +3180,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(),
@@ -3200,17 +3196,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(),
@@ -3235,6 +3231,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());
 	}
@@ -4367,6 +4372,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 */ []);
@@ -5627,6 +5642,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