@kuzntsv/uikit 1.0.42 → 1.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kuzntsv/uikit",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "peerDependencies": {
     "@angular/common": "^22.2.2",
     "@angular/core": "^22.2.2",

package/types/kuzntsv-uikit-ui.d.ts

@@ -1,6 +1,7 @@
 import * as i0 from "@angular/core";
 import { AfterViewInit, ElementRef, EnvironmentProviders, InjectionToken, OnDestroy, OnInit, PipeTransform, WritableSignal } from "@angular/core";
 import { NotificationService, RoleService } from "@kuzntsv/uikit";
+import { HttpClient, HttpContext, HttpParams, HttpResourceRef } from "@angular/common/http";
 import { Observable, Subject, Subscription } from "rxjs";
 import { SelectionModel } from "@angular/cdk/collections";
 import { MatMenuTrigger } from "@angular/material/menu";
@@ -12,7 +13,6 @@ import { FormControl, FormGroup } from "@angular/forms";
 import { MatDialog, MatDialogRef } from "@angular/material/dialog";
 import { SafeUrl } from "@angular/platform-browser";
 import { CanActivateFn, Router } from "@angular/router";
-import { HttpClient, HttpContext, HttpParams, HttpResourceRef } from "@angular/common/http";
 import { FieldTree } from "@angular/forms/signals";
 import { MatAutocompleteSelectedEvent } from "@angular/material/autocomplete";
 import { NativeDateAdapter } from "@angular/material/core";
@@ -50,9 +50,13 @@ export type ObjectKeys<T extends string | number | symbol = string, K = any> = {
 export type fnType<T> = ((data: T, extraData?: any) => void) | undefined;
 export type fnCbType<T> = ((callback: () => void, data: T, extraData?: any) => void) | undefined;
 export type SortDirection = 'asc' | 'desc' | '';
+/** @deprecated */
 export type fnGetDataType<T> = () => Observable<T[]>;
+/** @deprecated */
 export type fnGetCountType<T> = () => Observable<number>;
-export type fnMapEntityType<T> = () => ((item: T) => T);
+export type fnGetDataResType<T> = () => HttpResourceRef<T[]>;
+export type fnGetCountResType<T> = () => HttpResourceRef<number>;
+export type fnMapEntityType<T> = () => (item: T) => T;
 export interface ISortState {
   sortActive: string;
   sortDirection: SortDirection;
@@ -982,24 +986,24 @@ export declare class BaseSignalPageClass<T> implements OnDestroy {
   /** Список ролей, для которых скрыть элемент. */
   hideRoles: string[];
   /** Загрузка данных. */
-  loadData$: Subject<null>;
   /** Загрузка количества записей. */
-  loadLength$: Subject<null>;
   /** Очистка фильтра. (для очистки присвоить пустой объект '{}'). */
   clearFilters: import("@angular/core").WritableSignal<any>;
   /** Разрешен выбор нескольких строк. */
   allowMultiSelect: boolean;
   /** Выбранные строки в таблице. */
   selected: T[];
-  protected fnGetData: import("@angular/core").WritableSignal<fnGetDataType<T> | null>;
-  protected fnGetCount: import("@angular/core").WritableSignal<fnGetCountType<T> | null>;
+  protected fnGetData: import("@angular/core").WritableSignal<fnGetDataResType<T> | null>;
+  protected fnGetCount: import("@angular/core").WritableSignal<fnGetCountResType<T> | null>;
   protected fnMapEntity: import("@angular/core").WritableSignal<fnMapEntityType<T> | undefined>;
-  protected dataResource: import("@angular/core").ResourceRef<T[] | undefined>;
-  protected countResource: import("@angular/core").ResourceRef<number | undefined>;
+  protected dataResource: import("@angular/core").Signal<import("@angular/common/http").HttpResourceRef<T[]> | null>;
+  protected countResource: import("@angular/core").Signal<import("@angular/common/http").HttpResourceRef<number> | null>;
   /** Данные для табличного компонента. */
   data: import("@angular/core").Signal<T[]>;
   /** Количество записей по фильтру. */
   length: import("@angular/core").Signal<number>;
+  /** Глобальный индикатор загрузки (для спиннера на странице) */
+  isLoading: import("@angular/core").Signal<boolean>;
   /** Доступность кнопки "Изменить". */
   editBtnDisabled: boolean;
   /** Доступность кнопки "Удалить". */
@@ -1024,7 +1028,7 @@ export declare class BaseSignalPageClass<T> implements OnDestroy {
   tableState: import("@angular/core").WritableSignal<ITableState>;
   constructor();
   ngOnDestroy(): void;
-  subscribeToLoadData(fnGetData: fnGetDataType<T>, fnGetCount: fnGetCountType<T>, fnMapEntity?: fnMapEntityType<T>): void;
+  subscribeToLoadData(fnGetData: fnGetDataResType<T>, fnGetCount: fnGetCountResType<T>, fnMapEntity?: fnMapEntityType<T>): void;
   setFilter(key: string, value: any): void;
   onPageChange(pageState: IPageState): void;
   onSortChange(sortState: ISortState): void;
@@ -1070,7 +1074,7 @@ export declare abstract class BaseSignalServiceClass<T extends BaseSchemaClass>
   protected directionParam: string;
   protected apiContextName: string;
   protected http: HttpClient;
-  private readonly _refreshTrigger;
+  protected readonly _refreshTrigger: import("@angular/core").WritableSignal<number>;
   refresh(): void;
   getObjects(): HttpResourceRef<T[] | undefined>;
   getObject(id: number | (() => number)): HttpResourceRef<T | undefined>;