npm - @kuzntsv/uikit - Versions diffs - 1.0.12 → 1.0.15 - Mend

@kuzntsv/uikit 1.0.12 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/fesm2022/kuzntsv-uikit-interceptors.mjs +0 -2
package/fesm2022/kuzntsv-uikit-interceptors.mjs.map +1 -1
package/fesm2022/kuzntsv-uikit-ui.mjs +170 -75
package/fesm2022/kuzntsv-uikit-ui.mjs.map +1 -1
package/fesm2022/kuzntsv-uikit.mjs +108 -99
package/fesm2022/kuzntsv-uikit.mjs.map +1 -1
package/package.json +1 -1
package/types/kuzntsv-uikit-ui.d.ts +79 -29
package/types/kuzntsv-uikit.d.ts +64 -30

package/fesm2022/kuzntsv-uikit-interceptors.mjs CHANGED Viewed

@@ -1,7 +1,6 @@
 import { inject, InjectionToken, makeEnvironmentProviders } from '@angular/core';
 import { UIKIT_CONFIG, API_NAME, BYPASS_AUTH, UIKIT_NOTIFICATION_TOKEN, AuthEventService, REQUEST_TIMEOUT } from '@kuzntsv/uikit';
 import { HttpErrorResponse } from '@angular/common/http';
-import { Router } from '@angular/router';
 import { throwError, catchError, TimeoutError } from 'rxjs';
 import { timeout } from 'rxjs/operators';
@@ -28,7 +27,6 @@ const apiPrefixInterceptor = (req, next) => {
 const coreAuthInterceptor = (req, next) => {
     const config = inject(UIKIT_CONFIG);
-    const router = inject(Router);
     const isAuthDisabled = !!config.auth.disabled;
     if (isAuthDisabled) {
         return next(req); // авторизация полностью отключена

package/fesm2022/kuzntsv-uikit-interceptors.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"kuzntsv-uikit-interceptors.mjs","sources":["../../interceptors/src/api-prefix.interceptor.ts","../../interceptors/src/auth.interceptor.ts","../../interceptors/src/error.interceptor.ts","../../interceptors/src/timeout.interceptor.ts","../../interceptors/src/providers.ts","../../interceptors/src/public-api.ts","../../interceptors/src/kuzntsv-uikit-interceptors.ts"],"sourcesContent":["import { HttpInterceptorFn } from '@angular/common/http';\r\nimport { inject } from '@angular/core';\r\nimport { API_NAME, UIKIT_CONFIG } from '@kuzntsv/uikit';\r\n\r\nexport const apiPrefixInterceptor: HttpInterceptorFn = (req, next) => {\r\n // Если запрос уже абсолютный (начинается с http/https), игнорируем его\r\n if (req.url.startsWith('http://') \|\| req.url.startsWith('https://')) {\r\n return next(req);\r\n }\r\n\r\n const config = inject(UIKIT_CONFIG);\r\n\r\n // Читаем, какой API запросил сервис (например, 'analytics')\r\n const apiKeys = req.context.get(API_NAME);\r\n\r\n // Ищем адрес в конфиге. Если не нашли такой ключ, берем 'default'\r\n const targetBaseUrl = config.apiUrls[apiKeys] \|\| config.apiUrls['default'];\r\n\r\n if (!targetBaseUrl) {\r\n // Если даже default не настроен, пропускаем как есть\r\n return next(req);\r\n }\r\n\r\n // Нормализуем слеши при склеивании\r\n const baseUrl = targetBaseUrl.replace(/\\/$/, '');\r\n const url = req.url.startsWith('/') ? req.url : `/${req.url}`;\r\n\r\n const clonedReq = req.clone({ url: `${baseUrl}${url}` });\r\n return next(clonedReq);\r\n};\r\n","import { HttpErrorResponse, HttpInterceptorFn } from '@angular/common/http';\r\nimport { inject } from '@angular/core';\r\nimport { Router } from '@angular/router';\r\nimport { BYPASS_AUTH, UIKIT_CONFIG } from '@kuzntsv/uikit';\r\nimport { EMPTY, throwError } from 'rxjs';\r\n\r\nexport const coreAuthInterceptor: HttpInterceptorFn = (req, next) => {\r\n const config = inject(UIKIT_CONFIG);\r\n const router = inject(Router);\r\n\r\n const isAuthDisabled = !!config.auth.disabled;\r\n if (isAuthDisabled) {\r\n return next(req); // авторизация полностью отключена\r\n }\r\n\r\n // 0. маркер пропуска авторизации\r\n if (req.context.get(BYPASS_AUTH) === true) {\r\n return next(req); // Пропускаем проверку токенов для этого запроса\r\n }\r\n\r\n // 1. Проверяем, является ли URL публичным (не требующим авторизации)\r\n const isPublic = config.auth.publicUrls.some((url) => req.url.includes(url));\r\n if (isPublic) {\r\n return next(req);\r\n }\r\n\r\n // 2. Если в заголовках уже есть Authorization (например, передан вручную), отправляем как есть\r\n if (req.headers.has('Authorization')) {\r\n return next(req);\r\n }\r\n\r\n // 3. Пытаемся достать токен из LocalStorage по ключу из конфигурации\r\n const storageValue = localStorage.getItem(config.auth.userStorageKey);\r\n const user = storageValue ? JSON.parse(storageValue) : null;\r\n\r\n if (user && user.token) {\r\n // 4. Если токен есть, клонируем запрос и добавляем заголовок Bearer\r\n const authReq = req.clone({\r\n headers: req.headers\r\n .set('Authorization', `Bearer ${user.token}`)\r\n .set('User-Id', String(user.id))\r\n .set('Human-Id', String(user.idHuman)),\r\n });\r\n return next(authReq);\r\n }\r\n\r\n // 5. Если токена нет и запрос приватный — прерываем и редиректим на страницу логина\r\n // router.navigate([config.auth.loginRoute]);\r\n // 5. Если токена нет и запрос приватный — не редиректим вручную!\r\n // Просто кидаем 401 ошибку. Она сама прилетит в coreErrorInterceptor.\r\n return throwError(\r\n () =>\r\n new HttpErrorResponse({\r\n status: 401,\r\n statusText: 'Unauthorized',\r\n url: req.url,\r\n error: { message:'Запрос отменен: пользователь не авторизован' },\r\n }),\r\n );\r\n};\r\n","import { HttpInterceptorFn } from '@angular/common/http';\r\nimport { inject } from '@angular/core';\r\nimport { catchError, throwError, TimeoutError } from 'rxjs';\r\nimport { UIKIT_NOTIFICATION_TOKEN, AuthEventService } from '@kuzntsv/uikit';\r\n\r\n\r\n// Состояние для управления очередью запросов во время рефреша\r\nlet isRefreshing = false; // флаг того, что обновление уже идет\r\n// для ожидания токена\r\n// const refreshTokenSubject: BehaviorSubject<string \| null> = new BehaviorSubject<string \| null>(null);\r\n\r\nexport const coreErrorInterceptor: HttpInterceptorFn = (req, next) => {\r\n const notification = inject(UIKIT_NOTIFICATION_TOKEN, { optional: true });\r\n // const authService = inject(LibraryAuthService);\r\n // const config = inject(UIKIT_CONFIG);\r\n\r\n const eventService = inject(AuthEventService);\r\n\r\n return next(req).pipe(\r\n catchError((error: any) => { // Меняем тип на any, так как RxJS TimeoutError — это не HttpErrorResponse\r\n let errorMsg = 'Произошла непредвиденная ошибка';\r\n // Проверяем, что это ошибка 401 и запрос не шел на сам эндпоинт рефреша\r\n // const isRefreshRequest = req.url.includes(config.auth.refreshEndpoint);\r\n\r\n // 1. Проверяем, не является ли ошибка таймаутом RxJS\r\n if (error instanceof TimeoutError) {\r\n errorMsg = 'Время ожидания ответа от сервера истекло. Попробуйте позже.';\r\n notification?.error(errorMsg);\r\n return throwError(() => new Error(errorMsg));\r\n }\r\n\r\n switch (error.status) {\r\n case 0:\r\n errorMsg = 'Сервер не доступен';\r\n break;\r\n case 401:\r\n // if (!isRefreshRequest) {\r\n // // return handle401Error(req, next, authService, config);\r\n // }\r\n // else {\r\n eventService.notify401(); // Просто кидаем событие в шину\r\n errorMsg = 'Сессия истекла. Войдите заново.';\r\n // }\r\n break;\r\n case 403:\r\n errorMsg = 'Недостаточно прав для выполнения действия.';\r\n break;\r\n case 404:\r\n errorMsg = 'Ресурс не найден'; \r\n \r\n break;\r\n case 500:\r\n errorMsg = 'Ошибка сервера. Попробуйте позже.'; \r\n break;\r\n default:\r\n // Для 400 и прочих берем сообщение с бэка или дефолтное\r\n errorMsg = error.error?.message \|\| error.message \|\| errorMsg;\r\n break;\r\n }\r\n notification?.error(errorMsg);\r\n \r\n // Возвращаем исходную ошибку, чтобы вызывающий сервис/компонент \r\n // мог прочитать error.status или error.error при необходимости,\r\n // но при этом подменяем или дополняем сообщение.\r\n return throwError(() => error);\r\n })\r\n );\r\n};\r\n\r\n\r\n// // Функция управления очередью и вызова Refresh Token\r\n// function handle401Error(\r\n// req: HttpRequest<unknown>,\r\n// next: HttpHandlerFn,\r\n// authService: LibraryAuthService,\r\n// config: UikitConfig\r\n// ): Observable<any> {\r\n \r\n// if (!isRefreshing) {\r\n// isRefreshing = true;\r\n// refreshTokenSubject.next(null); // Сбрасываем старый токен в потоке ожидания\r\n\r\n// return authService.refreshToken().pipe(\r\n// switchMap((response) => {\r\n// isRefreshing = false;\r\n// refreshTokenSubject.next(response.accessToken); // Разблокируем стоящие в очереди запросы\r\n \r\n// // Повторяем текущий упавший запрос с НОВЫМ токеном\r\n// return next(injectNewToken(req, response.accessToken, config));\r\n// }),\r\n// catchError((refreshError) => {\r\n// isRefreshing = false;\r\n// return throwError(() => refreshError);\r\n// })\r\n// );\r\n// } else {\r\n// // Если обновление уже запущено другим запросом, текущий запрос \"встает в очередь\"\r\n// // и ждет, пока в refreshTokenSubject появится новое строковое значение токена\r\n// return refreshTokenSubject.pipe(\r\n// filter(token => token !== null),\r\n// take(1), // Берем только первое валидное значение и отписываемся\r\n// switchMap(newToken => {\r\n// // Повторяем запрос с обновленным токеном\r\n// return next(injectNewToken(req, newToken!, config));\r\n// })\r\n// );\r\n// }\r\n// }\r\n\r\n// // Хелпер для подстановки свежего токена в заголовки повторяемого запроса\r\n// function injectNewToken(req: HttpRequest<unknown>, token: string, config: any): HttpRequest<unknown> {\r\n// return req.clone({\r\n// headers: req.headers.set('Authorization', `Bearer ${token}`)\r\n// });\r\n// }","import { HttpInterceptorFn } from '@angular/common/http';\r\nimport { timeout } from 'rxjs/operators';\r\nimport { REQUEST_TIMEOUT } from '@kuzntsv/uikit';\r\n\r\nexport const timeoutInterceptor: HttpInterceptorFn = (req, next) => {\r\n const defaultTimeout = req.context.get(REQUEST_TIMEOUT);\r\n\r\n return next(req).pipe(\r\n timeout(defaultTimeout)\r\n );\r\n};","import { InjectionToken, makeEnvironmentProviders, EnvironmentProviders } from '@angular/core';\r\nimport { HttpInterceptorFn } from '@angular/common/http';\r\nimport { UIKIT_CONFIG, UikitConfig } from '@kuzntsv/uikit';\r\n\r\nimport { UikitInterceptors } from './public-api';\r\n\r\n// Это кастомный Multi-InjectionToken, в который мы прячем интерцепторы библиотеки\r\nexport const UIKIT_INTERCEPTORS = new InjectionToken<HttpInterceptorFn[]>('UikitInterceptors');\r\n\r\nexport function provideUikit(config: UikitConfig): EnvironmentProviders {\r\n return makeEnvironmentProviders([\r\n { provide: UIKIT_CONFIG, useValue: config },\r\n \r\n // Регистрируем интерцептор внутри нашего собственного токена\r\n { provide: UIKIT_INTERCEPTORS, useValue: UikitInterceptors, multi: true }\r\n ]);\r\n};\r\n\r\n","import { apiPrefixInterceptor } from \"./api-prefix.interceptor\";\r\nimport { coreAuthInterceptor } from \"./auth.interceptor\";\r\nimport { coreErrorInterceptor } from \"./error.interceptor\";\r\nimport { timeoutInterceptor } from \"./timeout.interceptor\";\r\n\r\n// Экспортируем готовый пирог для приложений\r\n// Порядок интерцепторов очень важен. Сначала должен отработать интерцептор авторизации \r\n// (чтобы проверить оригинальный относительный URL и прикрепить токен), \r\n// а затем интерцептор подстановки Base URL (превращающий путь в абсолютный).\r\nexport const UikitInterceptors = [\r\n coreErrorInterceptor, // 1. Ловит абсолютно ВСЕ ошибки: и сетевые, и таймауты, и искусственные 401\r\n apiPrefixInterceptor, // 2. Сначала превращаем URL в абсолютный (https://...)\r\n coreAuthInterceptor, // 3. Теперь проверяем publicUrls по полному пути и подставляем токен\r\n timeoutInterceptor // 4. Ближе всего к сети — контролирует время выполнения самого запроса\r\n];\r\n\r\nexport * from './providers';\r\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"kuzntsv-uikit-interceptors.mjs","sources":["../../interceptors/src/api-prefix.interceptor.ts","../../interceptors/src/auth.interceptor.ts","../../interceptors/src/error.interceptor.ts","../../interceptors/src/timeout.interceptor.ts","../../interceptors/src/providers.ts","../../interceptors/src/public-api.ts","../../interceptors/src/kuzntsv-uikit-interceptors.ts"],"sourcesContent":["import { HttpInterceptorFn } from '@angular/common/http';\r\nimport { inject } from '@angular/core';\r\nimport { API_NAME, UIKIT_CONFIG } from '@kuzntsv/uikit';\r\n\r\nexport const apiPrefixInterceptor: HttpInterceptorFn = (req, next) => {\r\n // Если запрос уже абсолютный (начинается с http/https), игнорируем его\r\n if (req.url.startsWith('http://') \|\| req.url.startsWith('https://')) {\r\n return next(req);\r\n }\r\n\r\n const config = inject(UIKIT_CONFIG);\r\n\r\n // Читаем, какой API запросил сервис (например, 'analytics')\r\n const apiKeys = req.context.get(API_NAME);\r\n\r\n // Ищем адрес в конфиге. Если не нашли такой ключ, берем 'default'\r\n const targetBaseUrl = config.apiUrls[apiKeys] \|\| config.apiUrls['default'];\r\n\r\n if (!targetBaseUrl) {\r\n // Если даже default не настроен, пропускаем как есть\r\n return next(req);\r\n }\r\n\r\n // Нормализуем слеши при склеивании\r\n const baseUrl = targetBaseUrl.replace(/\\/$/, '');\r\n const url = req.url.startsWith('/') ? req.url : `/${req.url}`;\r\n\r\n const clonedReq = req.clone({ url: `${baseUrl}${url}` });\r\n return next(clonedReq);\r\n};\r\n","import { HttpErrorResponse, HttpInterceptorFn } from '@angular/common/http';\r\nimport { inject } from '@angular/core';\r\nimport { BYPASS_AUTH, UIKIT_CONFIG } from '@kuzntsv/uikit';\r\nimport { throwError } from 'rxjs';\r\n\r\nexport const coreAuthInterceptor: HttpInterceptorFn = (req, next) => {\r\n const config = inject(UIKIT_CONFIG);\r\n\r\n const isAuthDisabled = !!config.auth.disabled;\r\n if (isAuthDisabled) {\r\n return next(req); // авторизация полностью отключена\r\n }\r\n\r\n // 0. маркер пропуска авторизации\r\n if (req.context.get(BYPASS_AUTH) === true) {\r\n return next(req); // Пропускаем проверку токенов для этого запроса\r\n }\r\n\r\n // 1. Проверяем, является ли URL публичным (не требующим авторизации)\r\n const isPublic = config.auth.publicUrls.some((url) => req.url.includes(url));\r\n if (isPublic) {\r\n return next(req);\r\n }\r\n\r\n // 2. Если в заголовках уже есть Authorization (например, передан вручную), отправляем как есть\r\n if (req.headers.has('Authorization')) {\r\n return next(req);\r\n }\r\n\r\n // 3. Пытаемся достать токен из LocalStorage по ключу из конфигурации\r\n const storageValue = localStorage.getItem(config.auth.userStorageKey);\r\n const user = storageValue ? JSON.parse(storageValue) : null;\r\n\r\n if (user && user.token) {\r\n // 4. Если токен есть, клонируем запрос и добавляем заголовок Bearer\r\n const authReq = req.clone({\r\n headers: req.headers\r\n .set('Authorization', `Bearer ${user.token}`)\r\n .set('User-Id', String(user.id))\r\n .set('Human-Id', String(user.idHuman)),\r\n });\r\n return next(authReq);\r\n }\r\n\r\n // 5. Если токена нет и запрос приватный — прерываем и редиректим на страницу логина\r\n // router.navigate([config.auth.loginRoute]);\r\n // 5. Если токена нет и запрос приватный — не редиректим вручную!\r\n // Просто кидаем 401 ошибку. Она сама прилетит в coreErrorInterceptor.\r\n return throwError(\r\n () =>\r\n new HttpErrorResponse({\r\n status: 401,\r\n statusText: 'Unauthorized',\r\n url: req.url,\r\n error: { message:'Запрос отменен: пользователь не авторизован' },\r\n }),\r\n );\r\n};\r\n","import { HttpInterceptorFn } from '@angular/common/http';\r\nimport { inject } from '@angular/core';\r\nimport { catchError, throwError, TimeoutError } from 'rxjs';\r\nimport { UIKIT_NOTIFICATION_TOKEN, AuthEventService } from '@kuzntsv/uikit';\r\n\r\n\r\n// Состояние для управления очередью запросов во время рефреша\r\nlet isRefreshing = false; // флаг того, что обновление уже идет\r\n// для ожидания токена\r\n// const refreshTokenSubject: BehaviorSubject<string \| null> = new BehaviorSubject<string \| null>(null);\r\n\r\nexport const coreErrorInterceptor: HttpInterceptorFn = (req, next) => {\r\n const notification = inject(UIKIT_NOTIFICATION_TOKEN, { optional: true });\r\n // const authService = inject(LibraryAuthService);\r\n // const config = inject(UIKIT_CONFIG);\r\n\r\n const eventService = inject(AuthEventService);\r\n\r\n return next(req).pipe(\r\n catchError((error: any) => { // Меняем тип на any, так как RxJS TimeoutError — это не HttpErrorResponse\r\n let errorMsg = 'Произошла непредвиденная ошибка';\r\n // Проверяем, что это ошибка 401 и запрос не шел на сам эндпоинт рефреша\r\n // const isRefreshRequest = req.url.includes(config.auth.refreshEndpoint);\r\n\r\n // 1. Проверяем, не является ли ошибка таймаутом RxJS\r\n if (error instanceof TimeoutError) {\r\n errorMsg = 'Время ожидания ответа от сервера истекло. Попробуйте позже.';\r\n notification?.error(errorMsg);\r\n return throwError(() => new Error(errorMsg));\r\n }\r\n\r\n switch (error.status) {\r\n case 0:\r\n errorMsg = 'Сервер не доступен';\r\n break;\r\n case 401:\r\n // if (!isRefreshRequest) {\r\n // // return handle401Error(req, next, authService, config);\r\n // }\r\n // else {\r\n eventService.notify401(); // Просто кидаем событие в шину\r\n errorMsg = 'Сессия истекла. Войдите заново.';\r\n // }\r\n break;\r\n case 403:\r\n errorMsg = 'Недостаточно прав для выполнения действия.';\r\n break;\r\n case 404:\r\n errorMsg = 'Ресурс не найден'; \r\n \r\n break;\r\n case 500:\r\n errorMsg = 'Ошибка сервера. Попробуйте позже.'; \r\n break;\r\n default:\r\n // Для 400 и прочих берем сообщение с бэка или дефолтное\r\n errorMsg = error.error?.message \|\| error.message \|\| errorMsg;\r\n break;\r\n }\r\n notification?.error(errorMsg);\r\n \r\n // Возвращаем исходную ошибку, чтобы вызывающий сервис/компонент \r\n // мог прочитать error.status или error.error при необходимости,\r\n // но при этом подменяем или дополняем сообщение.\r\n return throwError(() => error);\r\n })\r\n );\r\n};\r\n\r\n\r\n// // Функция управления очередью и вызова Refresh Token\r\n// function handle401Error(\r\n// req: HttpRequest<unknown>,\r\n// next: HttpHandlerFn,\r\n// authService: LibraryAuthService,\r\n// config: UikitConfig\r\n// ): Observable<any> {\r\n \r\n// if (!isRefreshing) {\r\n// isRefreshing = true;\r\n// refreshTokenSubject.next(null); // Сбрасываем старый токен в потоке ожидания\r\n\r\n// return authService.refreshToken().pipe(\r\n// switchMap((response) => {\r\n// isRefreshing = false;\r\n// refreshTokenSubject.next(response.accessToken); // Разблокируем стоящие в очереди запросы\r\n \r\n// // Повторяем текущий упавший запрос с НОВЫМ токеном\r\n// return next(injectNewToken(req, response.accessToken, config));\r\n// }),\r\n// catchError((refreshError) => {\r\n// isRefreshing = false;\r\n// return throwError(() => refreshError);\r\n// })\r\n// );\r\n// } else {\r\n// // Если обновление уже запущено другим запросом, текущий запрос \"встает в очередь\"\r\n// // и ждет, пока в refreshTokenSubject появится новое строковое значение токена\r\n// return refreshTokenSubject.pipe(\r\n// filter(token => token !== null),\r\n// take(1), // Берем только первое валидное значение и отписываемся\r\n// switchMap(newToken => {\r\n// // Повторяем запрос с обновленным токеном\r\n// return next(injectNewToken(req, newToken!, config));\r\n// })\r\n// );\r\n// }\r\n// }\r\n\r\n// // Хелпер для подстановки свежего токена в заголовки повторяемого запроса\r\n// function injectNewToken(req: HttpRequest<unknown>, token: string, config: any): HttpRequest<unknown> {\r\n// return req.clone({\r\n// headers: req.headers.set('Authorization', `Bearer ${token}`)\r\n// });\r\n// }","import { HttpInterceptorFn } from '@angular/common/http';\r\nimport { timeout } from 'rxjs/operators';\r\nimport { REQUEST_TIMEOUT } from '@kuzntsv/uikit';\r\n\r\nexport const timeoutInterceptor: HttpInterceptorFn = (req, next) => {\r\n const defaultTimeout = req.context.get(REQUEST_TIMEOUT);\r\n\r\n return next(req).pipe(\r\n timeout(defaultTimeout)\r\n );\r\n};","import { InjectionToken, makeEnvironmentProviders, EnvironmentProviders } from '@angular/core';\r\nimport { HttpInterceptorFn } from '@angular/common/http';\r\nimport { UIKIT_CONFIG, UikitConfig } from '@kuzntsv/uikit';\r\n\r\nimport { UikitInterceptors } from './public-api';\r\n\r\n// Это кастомный Multi-InjectionToken, в который мы прячем интерцепторы библиотеки\r\nexport const UIKIT_INTERCEPTORS = new InjectionToken<HttpInterceptorFn[]>('UikitInterceptors');\r\n\r\nexport function provideUikit(config: UikitConfig): EnvironmentProviders {\r\n return makeEnvironmentProviders([\r\n { provide: UIKIT_CONFIG, useValue: config },\r\n \r\n // Регистрируем интерцептор внутри нашего собственного токена\r\n { provide: UIKIT_INTERCEPTORS, useValue: UikitInterceptors, multi: true }\r\n ]);\r\n};\r\n\r\n","import { apiPrefixInterceptor } from \"./api-prefix.interceptor\";\r\nimport { coreAuthInterceptor } from \"./auth.interceptor\";\r\nimport { coreErrorInterceptor } from \"./error.interceptor\";\r\nimport { timeoutInterceptor } from \"./timeout.interceptor\";\r\n\r\n// Экспортируем готовый пирог для приложений\r\n// Порядок интерцепторов очень важен. Сначала должен отработать интерцептор авторизации \r\n// (чтобы проверить оригинальный относительный URL и прикрепить токен), \r\n// а затем интерцептор подстановки Base URL (превращающий путь в абсолютный).\r\nexport const UikitInterceptors = [\r\n coreErrorInterceptor, // 1. Ловит абсолютно ВСЕ ошибки: и сетевые, и таймауты, и искусственные 401\r\n apiPrefixInterceptor, // 2. Сначала превращаем URL в абсолютный (https://...)\r\n coreAuthInterceptor, // 3. Теперь проверяем publicUrls по полному пути и подставляем токен\r\n timeoutInterceptor // 4. Ближе всего к сети — контролирует время выполнения самого запроса\r\n];\r\n\r\nexport * from './providers';\r\n","/*\n Generated bundle index. Do not edit.\n /\n\nexport from './public-api';\n"],"names":[],"mappings":"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"}

package/fesm2022/kuzntsv-uikit-ui.mjs CHANGED Viewed

@@ -1,7 +1,8 @@
 import * as i0 from '@angular/core';
-import { input, output, effect, Component, viewChild, HostListener, inject, Injectable, Directive, signal, Pipe, ChangeDetectorRef, ChangeDetectionStrategy, linkedSignal, NgZone, ElementRef, InjectionToken, makeEnvironmentProviders } from '@angular/core';
-import { Router, RouterLink, ActivatedRoute } from '@angular/router';
-import { AuthService, RoleService, NotificationService, UIKIT_NOTIFICATION_TOKEN } from '@kuzntsv/uikit';
+import { input, output, effect, Component, viewChild, HostListener, inject, Injectable, computed, Directive, signal, Pipe, ChangeDetectorRef, ChangeDetectionStrategy, linkedSignal, NgZone, ElementRef, InjectionToken, makeEnvironmentProviders } from '@angular/core';
+import { Router, RouterLink } from '@angular/router';
+import { startWith, Subscription, Subject, tap, switchMap, map as map$1, forkJoin, take, filter, ReplaySubject, finalize } from 'rxjs';
+import { RoleService, NotificationService, HIDE_ROLE_MARKER, UIKIT_NOTIFICATION_TOKEN, AuthService } from '@kuzntsv/uikit';
 import * as i1 from '@angular/forms';
 import { FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule, NgControl } from '@angular/forms';
 import { MatButton, MatIconButton, MatAnchor } from '@angular/material/button';
@@ -18,7 +19,6 @@ import * as i2 from '@angular/material/autocomplete';
 import { MatAutocompleteModule, MatOption } from '@angular/material/autocomplete';
 import * as i3 from '@angular/material/chips';
 import { MatChipsModule } from '@angular/material/chips';
-import { startWith, Subscription, Subject, tap, switchMap, map as map$1, forkJoin, ReplaySubject } from 'rxjs';
 import { map, debounceTime, distinctUntilChanged, startWith as startWith$1 } from 'rxjs/operators';
 import { MAT_DATE_LOCALE, MAT_DATE_FORMATS, MatOption as MatOption$1, MatOptgroup } from '@angular/material/core';
 import { MatDateRangeInput, MatStartDate, MatEndDate, MatDatepickerToggle, MatDateRangePicker } from '@angular/material/datepicker';
@@ -334,16 +334,45 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImpo
         }] });
 class BaseToolbarComponent {
-    // Роли для кнопок
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesNewBtn = input([], ...(ngDevMode ? [{ debugName: "rolesNewBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesEditBtn = input([], ...(ngDevMode ? [{ debugName: "rolesEditBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesRemoveBtn = input([], ...(ngDevMode ? [{ debugName: "rolesRemoveBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesCopyBtn = input([], ...(ngDevMode ? [{ debugName: "rolesCopyBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesExcelBtn = input([], ...(ngDevMode ? [{ debugName: "rolesExcelBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesCsvBtn = input([], ...(ngDevMode ? [{ debugName: "rolesCsvBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesPdfBtn = input([], ...(ngDevMode ? [{ debugName: "rolesPdfBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesPrintBtn = input([], ...(ngDevMode ? [{ debugName: "rolesPrintBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesRefreshBtn = input([], ...(ngDevMode ? [{ debugName: "rolesRefreshBtn" }] : /* istanbul ignore next */ []));
+    /**
+     * Список Ролей, для которых кнопка видна. Если в списке есть роль 'HIDE', то скрывается.
+    */
     rolesClearBtn = input([], ...(ngDevMode ? [{ debugName: "rolesClearBtn" }] : /* istanbul ignore next */ []));
     // Состояния блокировки
     newBtnDisabled = input(false, ...(ngDevMode ? [{ debugName: "newBtnDisabled" }] : /* istanbul ignore next */ []));
@@ -381,10 +410,28 @@ class BaseToolbarComponent {
     clickedRefreshBtn = output();
     clickedClearBtn = output();
     // DI
-    authService = inject(AuthService);
+    // protected authService = inject(AuthService);
     roleService = inject(RoleService);
-    isShow(roles) {
-        return !this.roleService.isHideElement(roles, this.authService.roles());
+    // Вычисляемые сигналы видимости кнопок.
+    isNewBtnVisible = computed(() => this.checkVisibility(this.rolesNewBtn()), ...(ngDevMode ? [{ debugName: "isNewBtnVisible" }] : /* istanbul ignore next */ []));
+    isEditBtnVisible = computed(() => this.checkVisibility(this.rolesEditBtn()), ...(ngDevMode ? [{ debugName: "isEditBtnVisible" }] : /* istanbul ignore next */ []));
+    isRemoveBtnVisible = computed(() => this.checkVisibility(this.rolesRemoveBtn()), ...(ngDevMode ? [{ debugName: "isRemoveBtnVisible" }] : /* istanbul ignore next */ []));
+    isCopyBtnVisible = computed(() => this.checkVisibility(this.rolesCopyBtn()), ...(ngDevMode ? [{ debugName: "isCopyBtnVisible" }] : /* istanbul ignore next */ []));
+    isExcelBtnVisible = computed(() => this.checkVisibility(this.rolesExcelBtn()), ...(ngDevMode ? [{ debugName: "isExcelBtnVisible" }] : /* istanbul ignore next */ []));
+    isCsvBtnVisible = computed(() => this.checkVisibility(this.rolesCsvBtn()), ...(ngDevMode ? [{ debugName: "isCsvBtnVisible" }] : /* istanbul ignore next */ []));
+    isPdfBtnVisible = computed(() => this.checkVisibility(this.rolesPdfBtn()), ...(ngDevMode ? [{ debugName: "isPdfBtnVisible" }] : /* istanbul ignore next */ []));
+    isPrintBtnVisible = computed(() => this.checkVisibility(this.rolesPrintBtn()), ...(ngDevMode ? [{ debugName: "isPrintBtnVisible" }] : /* istanbul ignore next */ []));
+    isRefreshBtnVisible = computed(() => this.checkVisibility(this.rolesRefreshBtn()), ...(ngDevMode ? [{ debugName: "isRefreshBtnVisible" }] : /* istanbul ignore next */ []));
+    isClearBtnVisible = computed(() => this.checkVisibility(this.rolesClearBtn()), ...(ngDevMode ? [{ debugName: "isClearBtnVisible" }] : /* istanbul ignore next */ []));
+    /**
+     * Внутренний метод для вычисления видимости.
+     * Не вызывается напрямую из шаблона, а служит хелпером для декларативных computed.
+     * Проверяет, заблокирован ли доступ к элементу на основе списка ограничений.
+     * Возвращает true, если у пользователя есть запрещенная роль или передан маркер 'HIDE'.
+     * Администратор (ADMIN) всегда игнорирует любые запреты и маркер 'HIDE'.
+     */
+    checkVisibility(forbiddenRoles) {
+        return !this.roleService.hasForbiddenRole(forbiddenRoles);
     }
     onNewClick() {
         this.clickedNewBtn.emit();
@@ -417,7 +464,7 @@ class BaseToolbarComponent {
         this.clickedClearBtn.emit();
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: BaseToolbarComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.25", type: BaseToolbarComponent, isStandalone: true, selector: "ngx-uik-base-toolbar", inputs: { rolesNewBtn: { classPropertyName: "rolesNewBtn", publicName: "rolesNewBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesEditBtn: { classPropertyName: "rolesEditBtn", publicName: "rolesEditBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesRemoveBtn: { classPropertyName: "rolesRemoveBtn", publicName: "rolesRemoveBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesCopyBtn: { classPropertyName: "rolesCopyBtn", publicName: "rolesCopyBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesExcelBtn: { classPropertyName: "rolesExcelBtn", publicName: "rolesExcelBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesCsvBtn: { classPropertyName: "rolesCsvBtn", publicName: "rolesCsvBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesPdfBtn: { classPropertyName: "rolesPdfBtn", publicName: "rolesPdfBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesPrintBtn: { classPropertyName: "rolesPrintBtn", publicName: "rolesPrintBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesRefreshBtn: { classPropertyName: "rolesRefreshBtn", publicName: "rolesRefreshBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesClearBtn: { classPropertyName: "rolesClearBtn", publicName: "rolesClearBtn", isSignal: true, isRequired: false, transformFunction: null }, newBtnDisabled: { classPropertyName: "newBtnDisabled", publicName: "newBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, editBtnDisabled: { classPropertyName: "editBtnDisabled", publicName: "editBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, removeBtnDisabled: { classPropertyName: "removeBtnDisabled", publicName: "removeBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, copyBtnDisabled: { classPropertyName: "copyBtnDisabled", publicName: "copyBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, excelBtnDisabled: { classPropertyName: "excelBtnDisabled", publicName: "excelBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, csvBtnDisabled: { classPropertyName: "csvBtnDisabled", publicName: "csvBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, pdfBtnDisabled: { classPropertyName: "pdfBtnDisabled", publicName: "pdfBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, printBtnDisabled: { classPropertyName: "printBtnDisabled", publicName: "printBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, refreshBtnDisabled: { classPropertyName: "refreshBtnDisabled", publicName: "refreshBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, clearBtnDisabled: { classPropertyName: "clearBtnDisabled", publicName: "clearBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, newBtnTooltip: { classPropertyName: "newBtnTooltip", publicName: "newBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, editBtnTooltip: { classPropertyName: "editBtnTooltip", publicName: "editBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, removeBtnTooltip: { classPropertyName: "removeBtnTooltip", publicName: "removeBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, copyBtnTooltip: { classPropertyName: "copyBtnTooltip", publicName: "copyBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, excelBtnTooltip: { classPropertyName: "excelBtnTooltip", publicName: "excelBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, csvBtnTooltip: { classPropertyName: "csvBtnTooltip", publicName: "csvBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, pdfBtnTooltip: { classPropertyName: "pdfBtnTooltip", publicName: "pdfBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, printBtnTooltip: { classPropertyName: "printBtnTooltip", publicName: "printBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, refreshBtnTooltip: { classPropertyName: "refreshBtnTooltip", publicName: "refreshBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, clearBtnTooltip: { classPropertyName: "clearBtnTooltip", publicName: "clearBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, newBtnOpt: { classPropertyName: "newBtnOpt", publicName: "newBtnOpt", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { clickedNewBtn: "clickedNewBtn", clickedEditBtn: "clickedEditBtn", clickedRemoveBtn: "clickedRemoveBtn", clickedCopyBtn: "clickedCopyBtn", clickedExcelBtn: "clickedExcelBtn", clickedCsvBtn: "clickedCsvBtn", clickedPdfBtn: "clickedPdfBtn", clickedPrintBtn: "clickedPrintBtn", clickedRefreshBtn: "clickedRefreshBtn", clickedClearBtn: "clickedClearBtn" }, ngImport: i0, template: "<mat-toolbar>\r\n  @if (isShow(rolesNewBtn())) {\r\n    @if (newBtnOpt() && newBtnOpt().length > 0) {\r\n      <button [disabled]=\"newBtnDisabled()\" [matMenuTriggerFor]=\"menuNewBtn\"\r\n      mat-icon-button [matTooltip]=\"newBtnTooltip()\">\r\n      <mat-icon>add</mat-icon>\r\n      </button>\r\n      <mat-menu #menuNewBtn=\"matMenu\">\r\n        @for (menuItem of newBtnOpt(); track menuItem) {\r\n          @if (menuItem.title === '-' && !(menuItem.hideFn ? menuItem.hideFn(\"\") : menuItem.hide)) {\r\n            <mat-divider></mat-divider>\r\n          }\r\n          @if (menuItem.title !== '-' && !(menuItem.hideFn ? menuItem.hideFn(\"\") : menuItem.hide)) {\r\n            <button mat-menu-item\r\n              (click)=\"menuItem.onClickFn ? menuItem.onClickFn('') : ''\"\r\n              [disabled]=\"menuItem.disabledFn ? menuItem.disabledFn('') : menuItem.disabled\">\r\n              @if (menuItem.icon) {\r\n                <mat-icon>{{menuItem.icon}}</mat-icon>\r\n              }\r\n              {{ menuItem.title }}\r\n            </button>\r\n          }\r\n        }\r\n      </mat-menu>\r\n    } \r\n    @else {\r\n      <button [disabled]=\"newBtnDisabled()\" (click)=\"onNewClick()\"\r\n              mat-icon-button routerLink=\"new\" routerLinkActive=\"active\" [matTooltip]=\"newBtnTooltip()\">\r\n        <mat-icon>add</mat-icon>\r\n      </button>\r\n    }\r\n  }\r\n\r\n  @if (isShow(rolesEditBtn())) {\r\n    <button [disabled]=\"editBtnDisabled()\" (click)=\"onEditClick()\"\r\n            mat-icon-button routerLink=\"edit\" color=\"primary\" routerLinkActive=\"active\" [matTooltip]=\"editBtnTooltip()\">\r\n      <mat-icon>edit</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesRemoveBtn())) {\r\n    <button [disabled]=\"removeBtnDisabled()\" (click)=\"onRemoveClick()\"\r\n            mat-icon-button routerLink=\"delete\" color=\"warn\" routerLinkActive=\"active\" [matTooltip]=\"removeBtnTooltip()\">\r\n      <mat-icon>remove</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesCopyBtn())) {\r\n    <button [disabled]=\"copyBtnDisabled()\" (click)=\"onCopyClick()\"\r\n            mat-icon-button routerLink=\"delete\" routerLinkActive=\"active\" [matTooltip]=\"copyBtnTooltip()\">\r\n      <mat-icon>content_copy</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesExcelBtn())) {\r\n    <button [disabled]=\"excelBtnDisabled()\" (click)=\"onExcelClick()\"\r\n            mat-icon-button routerLink=\"excel\" routerLinkActive=\"active\" [matTooltip]=\"excelBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">explicit</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesCsvBtn())) {\r\n    <button [disabled]=\"csvBtnDisabled()\" (click)=\"onCsvClick()\"\r\n            mat-icon-button routerLink=\"csv\" routerLinkActive=\"active\" [matTooltip]=\"csvBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">download</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesPdfBtn())) {\r\n    <button [disabled]=\"pdfBtnDisabled()\" (click)=\"onPdfClick()\"\r\n            mat-icon-button routerLink=\"pdf\" routerLinkActive=\"active\" [matTooltip]=\"pdfBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">picture_as_pdf</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesPrintBtn())) {\r\n    <button [disabled]=\"printBtnDisabled()\" (click)=\"onPrintClick()\"\r\n            mat-icon-button routerLink=\"print\" routerLinkActive=\"active\" [matTooltip]=\"printBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">print_outline</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesRefreshBtn())) {\r\n    <button  [disabled]=\"refreshBtnDisabled()\" (click)=\"onRefreshGridClick()\"\r\n            mat-icon-button routerLink=\"refresh\" routerLinkActive=\"active\" [matTooltip]=\"refreshBtnTooltip()\">\r\n      <mat-icon>refresh</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesClearBtn())) {\r\n    <button [disabled]=\"clearBtnDisabled()\" (click)=\"onClearClick()\"\r\n            mat-icon-button routerLink=\"clear\" routerLinkActive=\"active\" [matTooltip]=\"clearBtnTooltip()\">\r\n      <mat-icon>clear</mat-icon>\r\n    </button>\r\n  }\r\n</mat-toolbar>\r\n", styles: [""], dependencies: [{ kind: "component", type: MatToolbar, selector: "mat-toolbar", inputs: ["color"], exportAs: ["matToolbar"] }, { kind: "component", type: MatIconButton, selector: "button[mat-icon-button], a[mat-icon-button], button[matIconButton], a[matIconButton]", exportAs: ["matButton", "matAnchor"] }, { kind: "directive", type: MatTooltip, selector: "[matTooltip]", inputs: ["matTooltipPosition", "matTooltipPositionAtOrigin", "matTooltipDisabled", "matTooltipShowDelay", "matTooltipHideDelay", "matTooltipTouchGestures", "matTooltip", "matTooltipClass"], exportAs: ["matTooltip"] }, { kind: "component", type: MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "component", type: MatMenu, selector: "mat-menu", inputs: ["backdropClass", "aria-label", "aria-labelledby", "aria-describedby", "xPosition", "yPosition", "overlapTrigger", "hasBackdrop", "class", "classList"], outputs: ["closed", "close"], exportAs: ["matMenu"] }, { kind: "component", type: MatDivider, selector: "mat-divider", inputs: ["vertical", "inset"] }, { kind: "directive", type: MatMenuTrigger, selector: "[mat-menu-trigger-for], [matMenuTriggerFor]", inputs: ["mat-menu-trigger-for", "matMenuTriggerFor", "matMenuTriggerData", "matMenuTriggerRestoreFocus"], outputs: ["menuOpened", "onMenuOpen", "menuClosed", "onMenuClose"], exportAs: ["matMenuTrigger"] }, { kind: "component", type: MatMenuItem, selector: "[mat-menu-item]", inputs: ["role", "disabled", "disableRipple"], exportAs: ["matMenuItem"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.25", type: BaseToolbarComponent, isStandalone: true, selector: "ngx-uik-base-toolbar", inputs: { rolesNewBtn: { classPropertyName: "rolesNewBtn", publicName: "rolesNewBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesEditBtn: { classPropertyName: "rolesEditBtn", publicName: "rolesEditBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesRemoveBtn: { classPropertyName: "rolesRemoveBtn", publicName: "rolesRemoveBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesCopyBtn: { classPropertyName: "rolesCopyBtn", publicName: "rolesCopyBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesExcelBtn: { classPropertyName: "rolesExcelBtn", publicName: "rolesExcelBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesCsvBtn: { classPropertyName: "rolesCsvBtn", publicName: "rolesCsvBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesPdfBtn: { classPropertyName: "rolesPdfBtn", publicName: "rolesPdfBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesPrintBtn: { classPropertyName: "rolesPrintBtn", publicName: "rolesPrintBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesRefreshBtn: { classPropertyName: "rolesRefreshBtn", publicName: "rolesRefreshBtn", isSignal: true, isRequired: false, transformFunction: null }, rolesClearBtn: { classPropertyName: "rolesClearBtn", publicName: "rolesClearBtn", isSignal: true, isRequired: false, transformFunction: null }, newBtnDisabled: { classPropertyName: "newBtnDisabled", publicName: "newBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, editBtnDisabled: { classPropertyName: "editBtnDisabled", publicName: "editBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, removeBtnDisabled: { classPropertyName: "removeBtnDisabled", publicName: "removeBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, copyBtnDisabled: { classPropertyName: "copyBtnDisabled", publicName: "copyBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, excelBtnDisabled: { classPropertyName: "excelBtnDisabled", publicName: "excelBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, csvBtnDisabled: { classPropertyName: "csvBtnDisabled", publicName: "csvBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, pdfBtnDisabled: { classPropertyName: "pdfBtnDisabled", publicName: "pdfBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, printBtnDisabled: { classPropertyName: "printBtnDisabled", publicName: "printBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, refreshBtnDisabled: { classPropertyName: "refreshBtnDisabled", publicName: "refreshBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, clearBtnDisabled: { classPropertyName: "clearBtnDisabled", publicName: "clearBtnDisabled", isSignal: true, isRequired: false, transformFunction: null }, newBtnTooltip: { classPropertyName: "newBtnTooltip", publicName: "newBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, editBtnTooltip: { classPropertyName: "editBtnTooltip", publicName: "editBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, removeBtnTooltip: { classPropertyName: "removeBtnTooltip", publicName: "removeBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, copyBtnTooltip: { classPropertyName: "copyBtnTooltip", publicName: "copyBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, excelBtnTooltip: { classPropertyName: "excelBtnTooltip", publicName: "excelBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, csvBtnTooltip: { classPropertyName: "csvBtnTooltip", publicName: "csvBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, pdfBtnTooltip: { classPropertyName: "pdfBtnTooltip", publicName: "pdfBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, printBtnTooltip: { classPropertyName: "printBtnTooltip", publicName: "printBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, refreshBtnTooltip: { classPropertyName: "refreshBtnTooltip", publicName: "refreshBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, clearBtnTooltip: { classPropertyName: "clearBtnTooltip", publicName: "clearBtnTooltip", isSignal: true, isRequired: false, transformFunction: null }, newBtnOpt: { classPropertyName: "newBtnOpt", publicName: "newBtnOpt", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { clickedNewBtn: "clickedNewBtn", clickedEditBtn: "clickedEditBtn", clickedRemoveBtn: "clickedRemoveBtn", clickedCopyBtn: "clickedCopyBtn", clickedExcelBtn: "clickedExcelBtn", clickedCsvBtn: "clickedCsvBtn", clickedPdfBtn: "clickedPdfBtn", clickedPrintBtn: "clickedPrintBtn", clickedRefreshBtn: "clickedRefreshBtn", clickedClearBtn: "clickedClearBtn" }, ngImport: i0, template: "<mat-toolbar>\r\n  @if (isNewBtnVisible()) {\r\n    @if (newBtnOpt() && newBtnOpt().length > 0) {\r\n      <button [disabled]=\"newBtnDisabled()\" [matMenuTriggerFor]=\"menuNewBtn\"\r\n      mat-icon-button [matTooltip]=\"newBtnTooltip()\">\r\n      <mat-icon>add</mat-icon>\r\n      </button>\r\n      <mat-menu #menuNewBtn=\"matMenu\">\r\n        @for (menuItem of newBtnOpt(); track menuItem) {\r\n          @if (menuItem.title === '-' && !(menuItem.hideFn ? menuItem.hideFn(\"\") : menuItem.hide)) {\r\n            <mat-divider></mat-divider>\r\n          }\r\n          @if (menuItem.title !== '-' && !(menuItem.hideFn ? menuItem.hideFn(\"\") : menuItem.hide)) {\r\n            <button mat-menu-item\r\n              (click)=\"menuItem.onClickFn ? menuItem.onClickFn('') : ''\"\r\n              [disabled]=\"menuItem.disabledFn ? menuItem.disabledFn('') : menuItem.disabled\">\r\n              @if (menuItem.icon) {\r\n                <mat-icon>{{menuItem.icon}}</mat-icon>\r\n              }\r\n              {{ menuItem.title }}\r\n            </button>\r\n          }\r\n        }\r\n      </mat-menu>\r\n    } \r\n    @else {\r\n      <button [disabled]=\"newBtnDisabled()\" (click)=\"onNewClick()\"\r\n              mat-icon-button routerLink=\"new\" routerLinkActive=\"active\" [matTooltip]=\"newBtnTooltip()\">\r\n        <mat-icon>add</mat-icon>\r\n      </button>\r\n    }\r\n  }\r\n\r\n  @if (isEditBtnVisible()) {\r\n    <button [disabled]=\"editBtnDisabled()\" (click)=\"onEditClick()\"\r\n            mat-icon-button routerLink=\"edit\" color=\"primary\" routerLinkActive=\"active\" [matTooltip]=\"editBtnTooltip()\">\r\n      <mat-icon>edit</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isRemoveBtnVisible()) {\r\n    <button [disabled]=\"removeBtnDisabled()\" (click)=\"onRemoveClick()\"\r\n            mat-icon-button routerLink=\"delete\" color=\"warn\" routerLinkActive=\"active\" [matTooltip]=\"removeBtnTooltip()\">\r\n      <mat-icon>remove</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isCopyBtnVisible()) {\r\n    <button [disabled]=\"copyBtnDisabled()\" (click)=\"onCopyClick()\"\r\n            mat-icon-button routerLink=\"delete\" routerLinkActive=\"active\" [matTooltip]=\"copyBtnTooltip()\">\r\n      <mat-icon>content_copy</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isExcelBtnVisible()) {\r\n    <button [disabled]=\"excelBtnDisabled()\" (click)=\"onExcelClick()\"\r\n            mat-icon-button routerLink=\"excel\" routerLinkActive=\"active\" [matTooltip]=\"excelBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">explicit</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isCsvBtnVisible()) {\r\n    <button [disabled]=\"csvBtnDisabled()\" (click)=\"onCsvClick()\"\r\n            mat-icon-button routerLink=\"csv\" routerLinkActive=\"active\" [matTooltip]=\"csvBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">download</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isPdfBtnVisible()) {\r\n    <button [disabled]=\"pdfBtnDisabled()\" (click)=\"onPdfClick()\"\r\n            mat-icon-button routerLink=\"pdf\" routerLinkActive=\"active\" [matTooltip]=\"pdfBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">picture_as_pdf</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isPrintBtnVisible()) {\r\n    <button [disabled]=\"printBtnDisabled()\" (click)=\"onPrintClick()\"\r\n            mat-icon-button routerLink=\"print\" routerLinkActive=\"active\" [matTooltip]=\"printBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">print_outline</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isRefreshBtnVisible()) {\r\n    <button  [disabled]=\"refreshBtnDisabled()\" (click)=\"onRefreshGridClick()\"\r\n            mat-icon-button routerLink=\"refresh\" routerLinkActive=\"active\" [matTooltip]=\"refreshBtnTooltip()\">\r\n      <mat-icon>refresh</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isClearBtnVisible()) {\r\n    <button [disabled]=\"clearBtnDisabled()\" (click)=\"onClearClick()\"\r\n            mat-icon-button routerLink=\"clear\" routerLinkActive=\"active\" [matTooltip]=\"clearBtnTooltip()\">\r\n      <mat-icon>clear</mat-icon>\r\n    </button>\r\n  }\r\n</mat-toolbar>\r\n", styles: [""], dependencies: [{ kind: "component", type: MatToolbar, selector: "mat-toolbar", inputs: ["color"], exportAs: ["matToolbar"] }, { kind: "component", type: MatIconButton, selector: "button[mat-icon-button], a[mat-icon-button], button[matIconButton], a[matIconButton]", exportAs: ["matButton", "matAnchor"] }, { kind: "directive", type: MatTooltip, selector: "[matTooltip]", inputs: ["matTooltipPosition", "matTooltipPositionAtOrigin", "matTooltipDisabled", "matTooltipShowDelay", "matTooltipHideDelay", "matTooltipTouchGestures", "matTooltip", "matTooltipClass"], exportAs: ["matTooltip"] }, { kind: "component", type: MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "component", type: MatMenu, selector: "mat-menu", inputs: ["backdropClass", "aria-label", "aria-labelledby", "aria-describedby", "xPosition", "yPosition", "overlapTrigger", "hasBackdrop", "class", "classList"], outputs: ["closed", "close"], exportAs: ["matMenu"] }, { kind: "component", type: MatDivider, selector: "mat-divider", inputs: ["vertical", "inset"] }, { kind: "directive", type: MatMenuTrigger, selector: "[mat-menu-trigger-for], [matMenuTriggerFor]", inputs: ["mat-menu-trigger-for", "matMenuTriggerFor", "matMenuTriggerData", "matMenuTriggerRestoreFocus"], outputs: ["menuOpened", "onMenuOpen", "menuClosed", "onMenuClose"], exportAs: ["matMenuTrigger"] }, { kind: "component", type: MatMenuItem, selector: "[mat-menu-item]", inputs: ["role", "disabled", "disableRipple"], exportAs: ["matMenuItem"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: BaseToolbarComponent, decorators: [{
             type: Component,
@@ -430,7 +477,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImpo
                         MatDivider,
                         MatMenuTrigger,
                         MatMenuItem,
-                    ], template: "<mat-toolbar>\r\n  @if (isShow(rolesNewBtn())) {\r\n    @if (newBtnOpt() && newBtnOpt().length > 0) {\r\n      <button [disabled]=\"newBtnDisabled()\" [matMenuTriggerFor]=\"menuNewBtn\"\r\n      mat-icon-button [matTooltip]=\"newBtnTooltip()\">\r\n      <mat-icon>add</mat-icon>\r\n      </button>\r\n      <mat-menu #menuNewBtn=\"matMenu\">\r\n        @for (menuItem of newBtnOpt(); track menuItem) {\r\n          @if (menuItem.title === '-' && !(menuItem.hideFn ? menuItem.hideFn(\"\") : menuItem.hide)) {\r\n            <mat-divider></mat-divider>\r\n          }\r\n          @if (menuItem.title !== '-' && !(menuItem.hideFn ? menuItem.hideFn(\"\") : menuItem.hide)) {\r\n            <button mat-menu-item\r\n              (click)=\"menuItem.onClickFn ? menuItem.onClickFn('') : ''\"\r\n              [disabled]=\"menuItem.disabledFn ? menuItem.disabledFn('') : menuItem.disabled\">\r\n              @if (menuItem.icon) {\r\n                <mat-icon>{{menuItem.icon}}</mat-icon>\r\n              }\r\n              {{ menuItem.title }}\r\n            </button>\r\n          }\r\n        }\r\n      </mat-menu>\r\n    } \r\n    @else {\r\n      <button [disabled]=\"newBtnDisabled()\" (click)=\"onNewClick()\"\r\n              mat-icon-button routerLink=\"new\" routerLinkActive=\"active\" [matTooltip]=\"newBtnTooltip()\">\r\n        <mat-icon>add</mat-icon>\r\n      </button>\r\n    }\r\n  }\r\n\r\n  @if (isShow(rolesEditBtn())) {\r\n    <button [disabled]=\"editBtnDisabled()\" (click)=\"onEditClick()\"\r\n            mat-icon-button routerLink=\"edit\" color=\"primary\" routerLinkActive=\"active\" [matTooltip]=\"editBtnTooltip()\">\r\n      <mat-icon>edit</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesRemoveBtn())) {\r\n    <button [disabled]=\"removeBtnDisabled()\" (click)=\"onRemoveClick()\"\r\n            mat-icon-button routerLink=\"delete\" color=\"warn\" routerLinkActive=\"active\" [matTooltip]=\"removeBtnTooltip()\">\r\n      <mat-icon>remove</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesCopyBtn())) {\r\n    <button [disabled]=\"copyBtnDisabled()\" (click)=\"onCopyClick()\"\r\n            mat-icon-button routerLink=\"delete\" routerLinkActive=\"active\" [matTooltip]=\"copyBtnTooltip()\">\r\n      <mat-icon>content_copy</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesExcelBtn())) {\r\n    <button [disabled]=\"excelBtnDisabled()\" (click)=\"onExcelClick()\"\r\n            mat-icon-button routerLink=\"excel\" routerLinkActive=\"active\" [matTooltip]=\"excelBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">explicit</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesCsvBtn())) {\r\n    <button [disabled]=\"csvBtnDisabled()\" (click)=\"onCsvClick()\"\r\n            mat-icon-button routerLink=\"csv\" routerLinkActive=\"active\" [matTooltip]=\"csvBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">download</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesPdfBtn())) {\r\n    <button [disabled]=\"pdfBtnDisabled()\" (click)=\"onPdfClick()\"\r\n            mat-icon-button routerLink=\"pdf\" routerLinkActive=\"active\" [matTooltip]=\"pdfBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">picture_as_pdf</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesPrintBtn())) {\r\n    <button [disabled]=\"printBtnDisabled()\" (click)=\"onPrintClick()\"\r\n            mat-icon-button routerLink=\"print\" routerLinkActive=\"active\" [matTooltip]=\"printBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">print_outline</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesRefreshBtn())) {\r\n    <button  [disabled]=\"refreshBtnDisabled()\" (click)=\"onRefreshGridClick()\"\r\n            mat-icon-button routerLink=\"refresh\" routerLinkActive=\"active\" [matTooltip]=\"refreshBtnTooltip()\">\r\n      <mat-icon>refresh</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isShow(rolesClearBtn())) {\r\n    <button [disabled]=\"clearBtnDisabled()\" (click)=\"onClearClick()\"\r\n            mat-icon-button routerLink=\"clear\" routerLinkActive=\"active\" [matTooltip]=\"clearBtnTooltip()\">\r\n      <mat-icon>clear</mat-icon>\r\n    </button>\r\n  }\r\n</mat-toolbar>\r\n" }]
+                    ], template: "<mat-toolbar>\r\n  @if (isNewBtnVisible()) {\r\n    @if (newBtnOpt() && newBtnOpt().length > 0) {\r\n      <button [disabled]=\"newBtnDisabled()\" [matMenuTriggerFor]=\"menuNewBtn\"\r\n      mat-icon-button [matTooltip]=\"newBtnTooltip()\">\r\n      <mat-icon>add</mat-icon>\r\n      </button>\r\n      <mat-menu #menuNewBtn=\"matMenu\">\r\n        @for (menuItem of newBtnOpt(); track menuItem) {\r\n          @if (menuItem.title === '-' && !(menuItem.hideFn ? menuItem.hideFn(\"\") : menuItem.hide)) {\r\n            <mat-divider></mat-divider>\r\n          }\r\n          @if (menuItem.title !== '-' && !(menuItem.hideFn ? menuItem.hideFn(\"\") : menuItem.hide)) {\r\n            <button mat-menu-item\r\n              (click)=\"menuItem.onClickFn ? menuItem.onClickFn('') : ''\"\r\n              [disabled]=\"menuItem.disabledFn ? menuItem.disabledFn('') : menuItem.disabled\">\r\n              @if (menuItem.icon) {\r\n                <mat-icon>{{menuItem.icon}}</mat-icon>\r\n              }\r\n              {{ menuItem.title }}\r\n            </button>\r\n          }\r\n        }\r\n      </mat-menu>\r\n    } \r\n    @else {\r\n      <button [disabled]=\"newBtnDisabled()\" (click)=\"onNewClick()\"\r\n              mat-icon-button routerLink=\"new\" routerLinkActive=\"active\" [matTooltip]=\"newBtnTooltip()\">\r\n        <mat-icon>add</mat-icon>\r\n      </button>\r\n    }\r\n  }\r\n\r\n  @if (isEditBtnVisible()) {\r\n    <button [disabled]=\"editBtnDisabled()\" (click)=\"onEditClick()\"\r\n            mat-icon-button routerLink=\"edit\" color=\"primary\" routerLinkActive=\"active\" [matTooltip]=\"editBtnTooltip()\">\r\n      <mat-icon>edit</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isRemoveBtnVisible()) {\r\n    <button [disabled]=\"removeBtnDisabled()\" (click)=\"onRemoveClick()\"\r\n            mat-icon-button routerLink=\"delete\" color=\"warn\" routerLinkActive=\"active\" [matTooltip]=\"removeBtnTooltip()\">\r\n      <mat-icon>remove</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isCopyBtnVisible()) {\r\n    <button [disabled]=\"copyBtnDisabled()\" (click)=\"onCopyClick()\"\r\n            mat-icon-button routerLink=\"delete\" routerLinkActive=\"active\" [matTooltip]=\"copyBtnTooltip()\">\r\n      <mat-icon>content_copy</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isExcelBtnVisible()) {\r\n    <button [disabled]=\"excelBtnDisabled()\" (click)=\"onExcelClick()\"\r\n            mat-icon-button routerLink=\"excel\" routerLinkActive=\"active\" [matTooltip]=\"excelBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">explicit</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isCsvBtnVisible()) {\r\n    <button [disabled]=\"csvBtnDisabled()\" (click)=\"onCsvClick()\"\r\n            mat-icon-button routerLink=\"csv\" routerLinkActive=\"active\" [matTooltip]=\"csvBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">download</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isPdfBtnVisible()) {\r\n    <button [disabled]=\"pdfBtnDisabled()\" (click)=\"onPdfClick()\"\r\n            mat-icon-button routerLink=\"pdf\" routerLinkActive=\"active\" [matTooltip]=\"pdfBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">picture_as_pdf</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isPrintBtnVisible()) {\r\n    <button [disabled]=\"printBtnDisabled()\" (click)=\"onPrintClick()\"\r\n            mat-icon-button routerLink=\"print\" routerLinkActive=\"active\" [matTooltip]=\"printBtnTooltip()\">\r\n      <mat-icon class=\"material-icons-outlined\">print_outline</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isRefreshBtnVisible()) {\r\n    <button  [disabled]=\"refreshBtnDisabled()\" (click)=\"onRefreshGridClick()\"\r\n            mat-icon-button routerLink=\"refresh\" routerLinkActive=\"active\" [matTooltip]=\"refreshBtnTooltip()\">\r\n      <mat-icon>refresh</mat-icon>\r\n    </button>\r\n  }\r\n  @if (isClearBtnVisible()) {\r\n    <button [disabled]=\"clearBtnDisabled()\" (click)=\"onClearClick()\"\r\n            mat-icon-button routerLink=\"clear\" routerLinkActive=\"active\" [matTooltip]=\"clearBtnTooltip()\">\r\n      <mat-icon>clear</mat-icon>\r\n    </button>\r\n  }\r\n</mat-toolbar>\r\n" }]
         }], propDecorators: { rolesNewBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesNewBtn", required: false }] }], rolesEditBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesEditBtn", required: false }] }], rolesRemoveBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesRemoveBtn", required: false }] }], rolesCopyBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesCopyBtn", required: false }] }], rolesExcelBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesExcelBtn", required: false }] }], rolesCsvBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesCsvBtn", required: false }] }], rolesPdfBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesPdfBtn", required: false }] }], rolesPrintBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesPrintBtn", required: false }] }], rolesRefreshBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesRefreshBtn", required: false }] }], rolesClearBtn: [{ type: i0.Input, args: [{ isSignal: true, alias: "rolesClearBtn", required: false }] }], newBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "newBtnDisabled", required: false }] }], editBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "editBtnDisabled", required: false }] }], removeBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "removeBtnDisabled", required: false }] }], copyBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "copyBtnDisabled", required: false }] }], excelBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "excelBtnDisabled", required: false }] }], csvBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "csvBtnDisabled", required: false }] }], pdfBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "pdfBtnDisabled", required: false }] }], printBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "printBtnDisabled", required: false }] }], refreshBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "refreshBtnDisabled", required: false }] }], clearBtnDisabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "clearBtnDisabled", required: false }] }], newBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "newBtnTooltip", required: false }] }], editBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "editBtnTooltip", required: false }] }], removeBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "removeBtnTooltip", required: false }] }], copyBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "copyBtnTooltip", required: false }] }], excelBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "excelBtnTooltip", required: false }] }], csvBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "csvBtnTooltip", required: false }] }], pdfBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "pdfBtnTooltip", required: false }] }], printBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "printBtnTooltip", required: false }] }], refreshBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "refreshBtnTooltip", required: false }] }], clearBtnTooltip: [{ type: i0.Input, args: [{ isSignal: true, alias: "clearBtnTooltip", required: false }] }], newBtnOpt: [{ type: i0.Input, args: [{ isSignal: true, alias: "newBtnOpt", required: false }] }], clickedNewBtn: [{ type: i0.Output, args: ["clickedNewBtn"] }], clickedEditBtn: [{ type: i0.Output, args: ["clickedEditBtn"] }], clickedRemoveBtn: [{ type: i0.Output, args: ["clickedRemoveBtn"] }], clickedCopyBtn: [{ type: i0.Output, args: ["clickedCopyBtn"] }], clickedExcelBtn: [{ type: i0.Output, args: ["clickedExcelBtn"] }], clickedCsvBtn: [{ type: i0.Output, args: ["clickedCsvBtn"] }], clickedPdfBtn: [{ type: i0.Output, args: ["clickedPdfBtn"] }], clickedPrintBtn: [{ type: i0.Output, args: ["clickedPrintBtn"] }], clickedRefreshBtn: [{ type: i0.Output, args: ["clickedRefreshBtn"] }], clickedClearBtn: [{ type: i0.Output, args: ["clickedClearBtn"] }] } });
 var Action;
@@ -510,16 +557,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImpo
         }], ctorParameters: () => [] });
 class BaseNavBarMenuClass {
-    subscription = new Subscription();
-    authService = inject(AuthService);
     roleService = inject(RoleService);
     router = inject(Router);
-    ngOnDestroy() {
-        if (this.subscription)
-            this.subscription.unsubscribe();
-    }
-    isShow(roles) {
-        return !this.roleService.isHideElement(roles, this.authService.roles());
+    /**
+     * Определяет видимость пункта меню.
+     * По умолчанию пункт меню ВИДИМ. Скрывается, если у пользователя есть запрещенная роль
+     * или если передан маркер скрытия фичи HIDE_ROLE_MARKER.
+     */
+    isMenuVisible(forbiddenRoles) {
+        return !this.roleService.hasForbiddenRole(forbiddenRoles);
     }
     /** Нажата средняя кнопка (открыть ссылку в новой вкладке). */
     onMiddleClick(event, baseUrl, menu) {
@@ -610,7 +656,7 @@ class BasePageClass {
     editorRoles = [];
     executeRoles = [];
     /** Список ролей, для которых скрыть элемент. */
-    hideRoles = ['HIDE'];
+    hideRoles = [HIDE_ROLE_MARKER];
     /** Загрузка данных. */
     loadData$ = new Subject();
     /** Загрузка количества записей. */
@@ -1101,15 +1147,18 @@ class NavBarComponent extends BaseNavBarMenuClass {
                 title: 'Подтверждение',
                 message: 'Вы хотите выйти?',
                 btnNoTitle: 'Отмена',
-                btnYesTitle: 'Выйти'
-            }
+                btnYesTitle: 'Выйти',
+            },
         });
-        const subs = dialogRef.afterClosed().subscribe((id) => {
+        dialogRef
+            .afterClosed()
+            .pipe(take(1), // Берем только одно значение (когда закрылся)
+        filter((id) => !!id))
+            .subscribe((id) => {
             if (id) {
                 this.onLogout();
             }
         });
-        this.subscription.add(subs);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: NavBarComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.25", type: NavBarComponent, isStandalone: true, selector: "ngx-uik-navbar", inputs: { visibleOnLogout: { classPropertyName: "visibleOnLogout", publicName: "visibleOnLogout", isSignal: true, isRequired: false, transformFunction: null }, visibleAvatar: { classPropertyName: "visibleAvatar", publicName: "visibleAvatar", isSignal: true, isRequired: false, transformFunction: null }, visibleLogoutBtn: { classPropertyName: "visibleLogoutBtn", publicName: "visibleLogoutBtn", isSignal: true, isRequired: false, transformFunction: null }, loggedIn: { classPropertyName: "loggedIn", publicName: "loggedIn", isSignal: true, isRequired: false, transformFunction: null }, fioUser: { classPropertyName: "fioUser", publicName: "fioUser", isSignal: true, isRequired: false, transformFunction: null }, userTooltip: { classPropertyName: "userTooltip", publicName: "userTooltip", isSignal: true, isRequired: false, transformFunction: null }, avatarURL: { classPropertyName: "avatarURL", publicName: "avatarURL", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { logout: "logout" }, usesInheritance: true, ngImport: i0, template: "@if (visibleOnLogout() || loggedIn()) {\r\n  <nav class=\"ngx-uik-navbar-header\">\r\n    \r\n    <ng-content></ng-content>\r\n\r\n    <div class=\"flex-spacer\"></div>\r\n    \r\n    @if (visibleAvatar() && (loggedIn() === false || !avatarURL)) {\r\n      <mat-icon [matTooltip]=\"userTooltip()\">account_circle</mat-icon>\r\n    }\r\n    @if (visibleAvatar() && loggedIn() && avatarURL()) {\r\n      <img\r\n        class=\"user-photo\"\r\n        [src]=\"avatarURL() | safe\"\r\n        loading=\"lazy\"\r\n        [alt]=\"fioUser()\"\r\n        [matTooltip]=\"userTooltip()\">\r\n    }\r\n\r\n    <span class = \"user-name\" [matTooltip]=\"userTooltip()\">\r\n      {{ fioUser() }}\r\n    </span>\r\n\r\n    @if (visibleLogoutBtn()) {\r\n      <a mat-button class=\"pm-button\" (click)=\"openDialog()\">\u0412\u044B\u0439\u0442\u0438 <mat-icon>logout</mat-icon></a>\r\n    }\r\n  </nav>\r\n}", styles: [".ngx-uik-navbar-header{display:flex;flex-wrap:wrap;align-items:center;padding:8px 16px}.flex-spacer{flex-grow:1}.user-name{margin-left:8px;line-height:1rem;white-space:normal}.user-photo{border-radius:50%;width:32px;height:32px;margin-right:10px}.mat-mdc-button{color:#fff!important;padding-left:16px!important;padding-right:16px!important}.mdc-button{letter-spacing:normal}\n"], dependencies: [{ kind: "component", type: MatAnchor, selector: "    button[matButton], a[matButton], button[mat-button], button[mat-raised-button],    button[mat-flat-button], button[mat-stroked-button], a[mat-button], a[mat-raised-button],    a[mat-flat-button], a[mat-stroked-button]  ", inputs: ["matButton"], exportAs: ["matButton", "matAnchor"] }, { kind: "component", type: MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "directive", type: MatTooltip, selector: "[matTooltip]", inputs: ["matTooltipPosition", "matTooltipPositionAtOrigin", "matTooltipDisabled", "matTooltipShowDelay", "matTooltipHideDelay", "matTooltipTouchGestures", "matTooltip", "matTooltipClass"], exportAs: ["matTooltip"] }, { kind: "pipe", type: SafePipe, name: "safe" }] });
@@ -1643,59 +1692,103 @@ class LoginPageComponent {
     pending = false;
     error = '';
     isKiosk = false;
-    /** Идентификатор АС */
-    idCas = 0;
-    /** Подписка на Идентификатор АС */
-    sub;
+    /**
+     * Идентификатор АС получаем автоматически из ActivatedRoute Data!
+     * (Для этого в настройках роутера должен быть включен withComponentInputBinding())
+     */
+    idCas = input(0, ...(ngDevMode ? [{ debugName: "idCas" }] : /* istanbul ignore next */ []));
     authService = inject(AuthService);
-    route = inject(ActivatedRoute);
+    router = inject(Router);
     loaderService = inject(LoaderService);
-    constructor() {
-        this.sub = this.route.data.subscribe(data => {
-            this.idCas = data['idCas'];
-        });
-    }
+    notificationService = inject(UIKIT_NOTIFICATION_TOKEN, {
+        optional: true,
+    });
     ngOnInit() {
-        if (localStorage.getItem('id_human') || localStorage.getItem('kiosk-keyboard-layout')) {
+        if (localStorage.getItem('id_human') ||
+            localStorage.getItem('kiosk-keyboard-layout')) {
             // this.isKiosk = true;
         }
     }
-    ngOnDestroy() {
-        this.sub.unsubscribe();
-    }
-    onSubmitError() {
-        return () => {
-            this.pending = false;
-            this.loaderService.hide();
-        };
-    }
     onSubmit($event) {
         this.loaderService.show();
         this.pending = true;
-        this.authService.login($event.username, $event.password, this.idCas, this.onSubmitError());
+        this.authService
+            .login($event.username, $event.password, this.idCas())
+            .pipe(
+        // Очищаем состояние лоадеров ВСЕГДА (и при успехе, и при ошибке)
+        finalize(() => {
+            this.pending = false;
+            this.loaderService.hide();
+        }))
+            .subscribe({
+            next: () => this.handleSuccessLogin(),
+            error: (error) => {
+                const errorMsg = error.error?.message || error.message || 'Ошибка при авторизации';
+                this.notificationService?.error(errorMsg, 0);
+            },
+        });
     }
     onSubmitPermit($event) {
         const permit = $event;
-        this.authService.loginByPermit(permit, this.idCas);
+        this.loaderService.show();
+        this.pending = true;
+        this.authService
+            .loginByPermit(permit, this.idCas())
+            .pipe(
+        // Очищаем состояние лоадеров ВСЕГДА (и при успехе, и при ошибке)
+        finalize(() => {
+            this.pending = false;
+            this.loaderService.hide();
+        }))
+            .subscribe({
+            next: () => this.handleSuccessLogin(),
+            error: (error) => {
+                const errorMsg = error.error?.message || error.message || 'Ошибка при авторизации';
+                this.notificationService?.error(errorMsg, 0);
+            },
+        });
+    }
+    handleSuccessLogin() {
+        this.notificationService?.success('Успешная авторизация');
+        // ЛОГИКА ВОЗВРАТА ПОСЛЕ УСПЕШНОГО ЛОГИНА
+        if (this.router) {
+            // Извлекаем returnUrl из текущего query-параметра текущего маршрута
+            const currentUrlTree = this.router.parseUrl(this.router.url);
+            const returnUrl = currentUrlTree.queryParamMap.get('returnUrl');
+            if (returnUrl) {
+                // Декодируем и перенаправляем пользователя туда, где он был
+                this.router.navigateByUrl(decodeURIComponent(returnUrl));
+                return;
+            }
+            // Если returnUrl нет, идем на главную
+            this.router.navigate(['/']);
+        }
+        // Логика перенаправления обратно: достаем returnUrl из текущих query-параметров страницы логина
+        const currentUrlTree = this.router.parseUrl(this.router.url);
+        const returnUrl = currentUrlTree.queryParamMap.get('returnUrl');
+        if (returnUrl) {
+            this.router.navigateByUrl(decodeURIComponent(returnUrl));
+        }
+        {
+            this.router.navigate(['/']); // дефолтный роут, если returnUrl нет
+        }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: LoginPageComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.25", type: LoginPageComponent, isStandalone: true, selector: "ngx-uik-login-page", ngImport: i0, template: "@if (!isKiosk) {\r\n    <ngx-uik-login-form\r\n      (submitted)=\"onSubmit($event)\"\r\n      [pending]=\"pending\"\r\n      [errorMessage]=\"error\">\r\n    </ngx-uik-login-form>\r\n  }\r\n  @if (isKiosk) {\r\n    <ngx-uik-permit-form\r\n      (submitted)=\"onSubmitPermit($event)\"\r\n      >\r\n    </ngx-uik-permit-form>\r\n  }", styles: [""], dependencies: [{ kind: "component", type: LoginFormComponent, selector: "ngx-uik-login-form", inputs: ["pending", "errorMessage"], outputs: ["submitted"] }, { kind: "component", type: PermitFormComponent, selector: "ngx-uik-permit-form", outputs: ["submitted"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.25", type: LoginPageComponent, isStandalone: true, selector: "ngx-uik-login-page", inputs: { idCas: { classPropertyName: "idCas", publicName: "idCas", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0, template: "@if (!isKiosk) {\r\n    <ngx-uik-login-form\r\n      (submitted)=\"onSubmit($event)\"\r\n      [pending]=\"pending\"\r\n      [errorMessage]=\"error\">\r\n    </ngx-uik-login-form>\r\n  }\r\n  @if (isKiosk) {\r\n    <ngx-uik-permit-form\r\n      (submitted)=\"onSubmitPermit($event)\"\r\n      >\r\n    </ngx-uik-permit-form>\r\n  }", styles: [""], dependencies: [{ kind: "component", type: LoginFormComponent, selector: "ngx-uik-login-form", inputs: ["pending", "errorMessage"], outputs: ["submitted"] }, { kind: "component", type: PermitFormComponent, selector: "ngx-uik-permit-form", outputs: ["submitted"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: LoginPageComponent, decorators: [{
             type: Component,
             args: [{ selector: 'ngx-uik-login-page', imports: [LoginFormComponent, PermitFormComponent], template: "@if (!isKiosk) {\r\n    <ngx-uik-login-form\r\n      (submitted)=\"onSubmit($event)\"\r\n      [pending]=\"pending\"\r\n      [errorMessage]=\"error\">\r\n    </ngx-uik-login-form>\r\n  }\r\n  @if (isKiosk) {\r\n    <ngx-uik-permit-form\r\n      (submitted)=\"onSubmitPermit($event)\"\r\n      >\r\n    </ngx-uik-permit-form>\r\n  }" }]
-        }], ctorParameters: () => [] });
+        }], propDecorators: { idCas: [{ type: i0.Input, args: [{ isSignal: true, alias: "idCas", required: false }] }] } });
 class DisableIfRoleDirective {
-    roles = input([], { ...(ngDevMode ? { debugName: "roles" } : /* istanbul ignore next */ {}), alias: 'ngxUikDisableIfRole' });
+    forbiddenRoles = input([], { ...(ngDevMode ? { debugName: "forbiddenRoles" } : /* istanbul ignore next */ {}), alias: 'ngxUikDisableIfRole' });
     el = inject(ElementRef);
-    authService = inject(AuthService);
     roleService = inject(RoleService);
     constructor() {
         effect(() => {
-            const hasRequiredRole = this.roleService.hasRoles(this.authService.roles(), this.roles());
-            // Блокируем, если ролей НЕТ
-            const shouldDisable = !hasRequiredRole;
+            // Спрашиваем у сервиса, заблокирована ли данная конфигурация ролей
+            const shouldDisable = this.roleService.hasForbiddenRole(this.forbiddenRoles());
             // 2. Безопасное управление атрибутом для любых элементов
             const nativeEl = this.el.nativeElement;
             if ('disabled' in nativeEl) {
@@ -1713,7 +1806,7 @@ class DisableIfRoleDirective {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: DisableIfRoleDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "21.2.25", type: DisableIfRoleDirective, isStandalone: true, selector: "[ngxUikDisableIfRole]", inputs: { roles: { classPropertyName: "roles", publicName: "ngxUikDisableIfRole", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0 });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "21.2.25", type: DisableIfRoleDirective, isStandalone: true, selector: "[ngxUikDisableIfRole]", inputs: { forbiddenRoles: { classPropertyName: "forbiddenRoles", publicName: "ngxUikDisableIfRole", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: DisableIfRoleDirective, decorators: [{
             type: Directive,
@@ -1721,43 +1814,44 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImpo
                     selector: '[ngxUikDisableIfRole]',
                     standalone: true
                 }]
-        }], ctorParameters: () => [], propDecorators: { roles: [{ type: i0.Input, args: [{ isSignal: true, alias: "ngxUikDisableIfRole", required: false }] }] } });
+        }], ctorParameters: () => [], propDecorators: { forbiddenRoles: [{ type: i0.Input, args: [{ isSignal: true, alias: "ngxUikDisableIfRole", required: false }] }] } });
-class HideIfRoleNotDirective {
-    roles = input([], { ...(ngDevMode ? { debugName: "roles" } : /* istanbul ignore next */ {}), alias: 'ngxUikHideIfRoleNot' });
+class HideIfForbiddenRoleDirective {
+    forbiddenRoles = input([], { ...(ngDevMode ? { debugName: "forbiddenRoles" } : /* istanbul ignore next */ {}), alias: 'ngxUikHideIfForbiddenRole' });
     el = inject(ElementRef);
-    authService = inject(AuthService);
     roleService = inject(RoleService);
     constructor() {
         effect(() => {
-            // Элемент скрывается, если у пользователя нет ни одной роли из перереданных в "roles"
-            // или в списке "roles" есть роль "hideRole".
-            const isHide = this.roleService.isHideElement(this.roles(), this.authService.roles());
+            // Элемент скрывается, если у пользователя есть запрещенная роль или передан маркер HIDE_ROLE_MARKER
+            const shouldHide = this.roleService.hasForbiddenRole(this.forbiddenRoles());
             // Управляем отображением. Пустая строка возвращает дефолтный CSS-стиль элемента.
-            this.el.nativeElement.style.display = isHide ? 'none' : '';
+            this.el.nativeElement.style.display = shouldHide ? 'none' : '';
         });
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: HideIfRoleNotDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "21.2.25", type: HideIfRoleNotDirective, isStandalone: true, selector: "[ngxUikHideIfRoleNot]", inputs: { roles: { classPropertyName: "roles", publicName: "ngxUikHideIfRoleNot", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: HideIfForbiddenRoleDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "21.2.25", type: HideIfForbiddenRoleDirective, isStandalone: true, selector: "[ngxUikHideIfForbiddenRole]", inputs: { forbiddenRoles: { classPropertyName: "forbiddenRoles", publicName: "ngxUikHideIfForbiddenRole", isSignal: true, isRequired: false, transformFunction: null } }, ngImport: i0 });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: HideIfRoleNotDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.25", ngImport: i0, type: HideIfForbiddenRoleDirective, decorators: [{
             type: Directive,
             args: [{
-                    selector: '[ngxUikHideIfRoleNot]',
-                    standalone: true
+                    selector: '[ngxUikHideIfForbiddenRole]',
+                    standalone: true,
                 }]
-        }], ctorParameters: () => [], propDecorators: { roles: [{ type: i0.Input, args: [{ isSignal: true, alias: "ngxUikHideIfRoleNot", required: false }] }] } });
+        }], ctorParameters: () => [], propDecorators: { forbiddenRoles: [{ type: i0.Input, args: [{ isSignal: true, alias: "ngxUikHideIfForbiddenRole", required: false }] }] } });
 class SetValueDirective {
-    value = input(undefined, { ...(ngDevMode ? { debugName: "value" } : /* istanbul ignore next */ {}), alias: 'setValue' });
+    value = input(null, { ...(ngDevMode ? { debugName: "value" } : /* istanbul ignore next */ {}), alias: 'setValue' });
     // 3. Используем опциональный inject, чтобы директива не падала, если формы нет
     ngControl = inject(NgControl, { optional: true });
     constructor() {
         effect(() => {
             // Эффект автоматически отслеживает изменение входного значения
             const val = this.value();
-            if (this.ngControl?.control) {
-                this.ngControl.control.setValue(val, { emitEvent: false });
+            // Безопасное приведение undefined к null для стандартизации значений в формах
+            const normalizedValue = val === undefined ? null : val;
+            // Используем проверку, так как на старте ngControl.control может быть еще не создан Angular-ом
+            if (this.ngControl && this.ngControl.control) {
+                this.ngControl.control.setValue(normalizedValue, { emitEvent: false });
             }
         });
     }
@@ -1794,14 +1888,15 @@ const redirectGuard = (route) => {
     return true;
 };
+/**
+ * Пускает на роут только тех пользователей, у которых есть роли из списка allowedRoles.
+ * ADMIN всегда имеет доступ.
+ */
 const roleGuard = (allowedRoles) => {
     return (route, state) => {
-        const authService = inject(AuthService);
         const roleService = inject(RoleService);
-        // Читаем роли из Сигнала
-        const userRoles = authService.roles();
         // Проверяем доступ на основе аргумента allowedRoles
-        return roleService.hasRoles(userRoles, allowedRoles);
+        return roleService.hasAnyRole(allowedRoles);
     };
 };
@@ -1878,5 +1973,5 @@ class SecUser {
  * Generated bundle index. Do not edit.
  */
-export { Action, AvatarService, BaseEditClass, BaseFilterClass, BaseMatChipComponent, BaseNavBarMenuClass, BasePageClass, BaseSelectAutocompleteWithVsComponent, BaseSelectWithGroupComponent, BaseServiceClass, BaseToolbarComponent, DateRangeInputComponent, DialogAction, DialogComponent, DisableIfRoleDirective, EmptyComponent, EntityAction, ExportService, HideIfRoleNotDirective, LOGGER_CONFIG, LoaderService, LocalStorageService, LoggerService, LoginPageComponent, MY_FORMATS, NavBarComponent, NotFoundComponent, ProgressSpinnerComponent, SafePipe, SecUser, SetValueDirective, SseService, TableComponent, TimePipe, TruncatePipe, authGuard, dateFormat, provideLogger, redirectGuard, roleGuard };
+export { Action, AvatarService, BaseEditClass, BaseFilterClass, BaseMatChipComponent, BaseNavBarMenuClass, BasePageClass, BaseSelectAutocompleteWithVsComponent, BaseSelectWithGroupComponent, BaseServiceClass, BaseToolbarComponent, DateRangeInputComponent, DialogAction, DialogComponent, DisableIfRoleDirective, EmptyComponent, EntityAction, ExportService, HideIfForbiddenRoleDirective, LOGGER_CONFIG, LoaderService, LocalStorageService, LoggerService, LoginPageComponent, MY_FORMATS, NavBarComponent, NotFoundComponent, ProgressSpinnerComponent, SafePipe, SecUser, SetValueDirective, SseService, TableComponent, TimePipe, TruncatePipe, authGuard, dateFormat, provideLogger, redirectGuard, roleGuard };
 //# sourceMappingURL=kuzntsv-uikit-ui.mjs.map