@kuzntsv/uikit 1.0.90 → 1.0.92

package/fesm2022/kuzntsv-uikit-ui.mjs

@@ -38,7 +38,7 @@ import { MatSort, MatSortModule } from "@angular/material/sort";
 import * as i1 from "@angular/material/table";
 import { MatTableDataSource, MatTableModule } from "@angular/material/table";
 const loginSchema = z$1.object({
-	username: z$1.string().min(1, { message: "Пожалуйста, заполните это поле" }).regex(/^[A-Za-z]{1,}\.[A-Za-z]{1,}\.[A-Za-z]*$/, { message: "Пожалуйста, используйте требуемый формат (Пример: a.p.petrov)" }),
+	username: z$1.string().min(1, { message: "Пожалуйста, заполните это поле" }).regex(/^[A-Za-z]{1,}\.[A-Za-z]{1,}\.[A-Za-z]*$/, { message: "Пожалуйста, используйте формат \"a.p.petrov\"" }),
 	password: z$1.string().min(1, { message: "Пожалуйста, заполните это поле" })
 });
 var LoginFormComponent = class LoginFormComponent {
@@ -2265,10 +2265,9 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 	}
 	initFilters() {
 		if (!this.filterSchema || !this.defaultFilters) return;
-		const prefix = this.storagePrefix;
 		const initial = { ...this.defaultFilters };
 		Object.keys(this.defaultFilters).forEach((key) => {
-			const storageKey = `${prefix}${key}`;
+			const storageKey = `${this.storagePrefix}${key}`;
 			const rawValue = this.localStorageService.getData(storageKey);
 			if (rawValue !== null && rawValue !== void 0) try {
 				initial[key] = JSON.parse(rawValue);
@@ -2279,15 +2278,6 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 		const validation = this.filterSchema.safeParse(initial);
 		this.filters.set(validation.success ? validation.data : this.defaultFilters);
 	}
-	clearEvent() {
-		if (!this.defaultFilters) return;
-		const prefix = this.storagePrefix;
-		Object.keys(this.defaultFilters).forEach((key) => {
-			localStorage.removeItem(`${prefix}${key}`);
-		});
-		this.filters.set({ ...this.defaultFilters });
-		this.clearFilters.set({});
-	}
 	getInitialFilters2() {
 		const prefix = this.constructor.name + "_Filter_";
 		const state = {};
@@ -2305,6 +2295,18 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 		}
 		return state;
 	}
+	clearEvent() {
+		if (!this.defaultFilters) return;
+		Object.keys(this.defaultFilters).forEach((key) => {
+			this.localStorageService.removeData(`${this.storagePrefix}${key}`);
+		});
+		this.tableState.update((prev) => ({
+			...prev,
+			pageIndex: 0
+		}));
+		this.filters.set({ ...this.defaultFilters });
+		this.clearFilters.set({});
+	}
 	filters = signal({}, ...ngDevMode ? [{ debugName: "filters" }] : /* istanbul ignore next */ []);
 	clearFilters = signal(null, ...ngDevMode ? [{ debugName: "clearFilters" }] : /* istanbul ignore next */ []);
 	tableState = signal({
@@ -2323,15 +2325,14 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 		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);
+					const storageKey = `${this.storagePrefix}${String(key)}`;
+					if (currVal === null || currVal === void 0 || currVal === "" || currVal === 0 || currVal === -1 || Array.isArray(currVal) && currVal.length === 0) this.localStorageService.removeData(storageKey);
 					else this.localStorageService.saveData(storageKey, JSON.stringify(currVal));
 				}
 			});
@@ -2418,7 +2419,7 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 	}
 	newEvent() {
 		if (this.entityEditComponent) {
-			const defaultEntity = this.schema.parse({});
+			const defaultEntity = this.schemaDTO.parse({});
 			const data = {
 				action: Action.Add,
 				entity: defaultEntity
@@ -2461,7 +2462,7 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 			if (this.entityEditComponent) {
 				const data = {
 					action: Action.Edit,
-					entity: this.selected[0]
+					entity: this.formModelToDomainModel(this.selected[0])
 				};
 				if (this.beforeOpenDialogOnEditEvent) this.beforeOpenDialogOnEditEvent(data.entity, data.extraData);
 				const dialogRef = this.openDialog(this.entityEditComponent, data, this.dialog);
@@ -2576,6 +2577,12 @@ var BaseSignalPageClass = class BaseSignalPageClass {
 			}
 		};
 	}
+	formModelToDomainModel(formModel, originalDomain) {
+		return {
+			...originalDomain,
+			...formModel
+		};
+	}
 	static ɵfac = i0.ɵɵngDeclareFactory({
 		minVersion: "12.0.0",
 		version: "22.2.2",