@kuzntsv/uikit 1.0.42 → 1.0.44

package/fesm2022/kuzntsv-uikit-ui.mjs

@@ -29,7 +29,6 @@ import { MatDivider } from "@angular/material/divider";
 import { MatMenu, MatMenuContent, MatMenuItem, MatMenuTrigger } from "@angular/material/menu";
 import { MatToolbar } from "@angular/material/toolbar";
 import z, { z as z$1 } from "zod";
-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";
@@ -2296,9 +2295,6 @@ var BasePageClass = class BasePageClass {
 		this.loadData$.next(null);
 		this.loadLength$.next(null);
 	}
-	entityFactory(type) {
-		return new type();
-	}
 	onSelectionChange(selected) {
 		this.selected = selected;
 		this.editBtnDisabledUpdate(this.selected);
@@ -2732,48 +2728,37 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 	editorRoles = [];
 	executeRoles = [];
 	hideRoles = [HIDE_ROLE_MARKER];
-	loadData$ = new Subject();
-	loadLength$ = new Subject();
 	clearFilters = signal(null, ...ngDevMode ? [{ debugName: "clearFilters" }] : /* istanbul ignore next */ []);
 	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 = 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 */ []);
+	dataResource = computed(() => {
+		const fetchFn = this.fnGetData();
+		if (!fetchFn) return null;
+		this.tableState();
+		this.filters();
+		return fetchFn();
+	}, ...ngDevMode ? [{ debugName: "dataResource" }] : /* istanbul ignore next */ []);
+	countResource = computed(() => {
+		const fetchCountFn = this.fnGetCount();
+		if (!fetchCountFn) return null;
+		this.filters();
+		return fetchCountFn();
+	}, ...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;
+	}, ...ngDevMode ? [{ debugName: "data" }] : /* 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;
+		return dataLoading || countLoading;
+	}, ...ngDevMode ? [{ debugName: "isLoading" }] : /* istanbul ignore next */ []);
 	editBtnDisabled = true;
 	removeBtnDisabled = true;
 	dblClickedEventEnable = true;
@@ -2819,6 +2804,10 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 			pageIndex: Number(this.localStorageService.getData(this.constructor.name + "PageIndex")) || this.defaultPageIndex,
 			pageSize: Number(this.localStorageService.getData(this.constructor.name + "PageSize")) || this.defaultPageSize
 		});
+		effect(() => {
+			if (this.isLoading()) this.loaderService.show();
+			else this.loaderService.hide();
+		});
 	}
 	ngOnDestroy() {
 		this.subscription.unsubscribe();
@@ -2830,6 +2819,10 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 	}
 	setFilter(key, value) {
 		const storageKey = `${this.constructor.name}_Filter_${key}`;
+		this.tableState.update((prev) => ({
+			...prev,
+			pageIndex: 0
+		}));
 		this.filters.update((prev) => {
 			const next = { ...prev };
 			if (value === null || value === void 0 || value === "" || value === "-1") {
@@ -2841,10 +2834,6 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 			}
 			return next;
 		});
-		this.tableState.update((prev) => ({
-			...prev,
-			pageIndex: 0
-		}));
 	}
 	onPageChange(pageState) {
 		this.localStorageService.saveData(this.constructor.name + "PageIndex", pageState.pageIndex.toString());
@@ -2864,9 +2853,6 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 			sortDirection: sortState.sortDirection
 		}));
 	}
-	entityFactory(type) {
-		return new type();
-	}
 	onSelectionChange(selected) {
 		this.selected = selected;
 		this.editBtnDisabledUpdate(this.selected);
@@ -2991,8 +2977,8 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 		}
 	}
 	refreshEvent() {
-		this.dataResource.reload();
-		this.countResource.reload();
+		this.dataResource()?.reload();
+		this.countResource()?.reload();
 	}
 	clearEvent() {
 		const prefix = this.constructor.name + "_Filter_";
@@ -3095,7 +3081,10 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 		this._refreshTrigger.update((v) => v + 1);
 	}
 	getObjects() {
-		return httpResource(() => ({ url: this.baseRoute }), {
+		return httpResource(() => {
+			this._refreshTrigger();
+			return { url: this.baseRoute };
+		}, {
 			...this.getHttpContext(),
 			parse: (data) => {
 				if (!data) return [];
@@ -3105,19 +3094,31 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 	}
 	getObject(id) {
 		const idSignal = typeof id === "function" ? id : () => id;
-		return httpResource(() => `${this.baseRoute}${idSignal()}`, {
+		return httpResource(() => {
+			this._refreshTrigger();
+			const currentId = idSignal();
+			if (currentId === null || currentId === void 0) return;
+			return { url: `${this.baseRoute}${currentId}` };
+		}, {
 			...this.getHttpContext(),
-			parse: (data) => data ? new this.entityType(data).deserialize(data) : null
+			parse: (data) => {
+				if (!data) return null;
+				return this.schema.parse(data);
+			}
 		});
 	}
 	getCount() {
-		return httpResource(() => ({ url: `${this.baseRoute}${this.countRoute}` }), {
+		return httpResource(() => {
+			this._refreshTrigger();
+			return { url: `${this.baseRoute}${this.countRoute}` };
+		}, {
 			...this.getHttpContext(),
-			parse: (data) => Number(data)
+			parse: (data) => z.coerce.number().parse(data)
 		});
 	}
 	getObjectsByPaging(pageIndex, pageSize, sortColumn, direction) {
 		return httpResource(() => {
+			this._refreshTrigger();
 			const queryParams = {};
 			if (pageIndex() + 1) queryParams[this.pageIndexParam] = pageIndex() + 1;
 			if (pageSize()) queryParams[this.pageSizeParam] = pageSize();
@@ -3129,35 +3130,18 @@ var BaseSignalServiceClass = class BaseSignalServiceClass {
 			};
 		}, {
 			...this.getHttpContext(),
-			parse: (data) => Array.isArray(data) ? data.map((item) => new this.entityType(item).deserialize(item)) : []
+			parse: (data) => {
+				if (!data) return [];
+				return z.array(this.schema).parse(data);
+			}
 		});
 	}
 	newObject(entity) {
 		return this.http.post(this.baseRoute, entity, this.getHttpContext());
 	}
-	create(dto) {
-		return httpResource(() => ({
-			url: this.baseRoute,
-			method: "POST",
-			body: dto
-		}), {
-			...this.getHttpContext(),
-			parse: (data) => this.schema.parse(data)
-		});
-	}
 	editObject(entity) {
 		return this.http.put(this.baseRoute + entity.id, entity, this.getHttpContext());
 	}
-	update(id, dto) {
-		return httpResource(() => ({
-			url: `${this.baseRoute}/${id}`,
-			method: "PUT",
-			body: dto
-		}), {
-			...this.getHttpContext(),
-			parse: (data) => this.schema.parse(data)
-		});
-	}
 	deleteObject(entity) {
 		return this.http.delete(this.baseRoute + entity.id, this.getHttpContext()).pipe(tap(() => this.refresh()));
 	}