@webitel/ui-sdk 26.8.133 → 26.8.134

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webitel/ui-sdk",
-	"version": "26.8.133",
+	"version": "26.8.134",
 	"private": false,
 	"scripts": {
 		"dev": "npm run docs:dev",

package/src/modules/Userinfo/stores/accessStore.ts

@@ -1,7 +1,5 @@
 import { defineStore } from 'pinia';
 import { ref } from 'vue';
-import type { NavigationGuard, RouteLocationNormalized } from 'vue-router';
-
 import { CrudAction, type WtApplication, type WtObject } from '../../../enums';
 import type { SpecialGlobalAction, WebitelLicense } from '../enums';
 import { wtObjectsWithGlobalSpecialActionAccessAsChecksSource } from '../mappings/mappings';
@@ -14,11 +12,13 @@ import {
 	shouldUseGlobalCrudActionAccessAsChecksSource,
 } from '../scripts/utils';
 import type {
+	AccessGuardRoute,
 	AppVisibilityMap,
 	CreateUserAccessStoreConfig,
 	CreateUserAccessStoreRawAccess,
 	FullUiSectionName,
 	GlobalActionAccessMap,
+	RouteAccessGuard,
 	ScopeAccessMap,
 	SectionVisibilityMap,
 	UiSection,
@@ -110,23 +110,21 @@ export const createUserAccessStore = ({
 			return allowAppVisibility && allowObjectAccess && allowSectionVisibility;
 		};
 
-		const routeAccessGuard: NavigationGuard = (to) => {
+		const routeAccessGuard: RouteAccessGuard = (to) => {
 			let wtApplication = to.matched
 				.toReversed()
 				.find(({ meta }) => meta.WtApplication)?.meta?.WtApplication as
 				| WtApplication
-				| ((route: RouteLocationNormalized) => WtApplication);
+				| ((route: AccessGuardRoute) => WtApplication);
 
 			/* find last because "matched" has top=>bottom routes order */
 			let uiSection = to.matched.toReversed().find(({ meta }) => meta.UiSection)
 				?.meta?.UiSection as
 				| UiSection
-				| ((route: RouteLocationNormalized) => UiSection);
+				| ((route: AccessGuardRoute) => UiSection);
 			/* find last because "matched" has top=>bottom routes order */
 			let wtObject = to.matched.toReversed().find(({ meta }) => meta.UiSection)
-				?.meta?.WtObject as
-				| WtObject
-				| ((route: RouteLocationNormalized) => WtObject);
+				?.meta?.WtObject as WtObject | ((route: AccessGuardRoute) => WtObject);
 
 			// if, then compute fn
 			if (typeof wtApplication === 'function') {

package/src/modules/Userinfo/types/UserAccess.ts

@@ -1,4 +1,7 @@
-import type { NavigationGuard } from 'vue-router';
+import type {
+	RouteLocationNormalized,
+	RouteLocationResolved,
+} from 'vue-router';
 
 import type {
 	AdminSections,
@@ -110,6 +113,22 @@ export type AppVisibilityMap = Map<WtApplication, boolean>;
  * */
 export type SectionVisibilityMap = Map<FullUiSectionName, boolean>;
 
+/**
+ * [Claude] Route that access is checked for: a navigation target or a result of
+ * [Claude] `router.resolve()` (its `name` may be `null`).
+ */
+export type AccessGuardRoute = RouteLocationNormalized | RouteLocationResolved;
+
+/**
+ * [Claude] Checks route access by `to` only, so it can be called directly to get
+ * [Claude] a verdict (`=== true`) and still be passed to `router.beforeEach`.
+ */
+export type RouteAccessGuard = (to: AccessGuardRoute) =>
+	| true
+	| {
+			path: string;
+	  };
+
 export interface UserAccessStore {
 	initialize: (rawAccess: CreateUserAccessStoreRawAccess) => void;
 
@@ -118,7 +137,7 @@ export interface UserAccessStore {
 	hasUpdateAccess: (object?: WtObject) => boolean;
 	hasDeleteAccess: (object?: WtObject) => boolean;
 
-	routeAccessGuard: NavigationGuard;
+	routeAccessGuard: RouteAccessGuard;
 
 	hasSpecialGlobalActionAccess: (id: SpecialGlobalAction) => boolean;
 	hasGlobalCrudActionAccess: (action: CrudAction) => boolean;