@webitel/ui-sdk 26.8.133 → 26.8.135

package/src/locale/uz/uz.js

@@ -425,8 +425,6 @@ export default {
 				[AdminSections.Buckets]: 'Savatlar',
 				[AdminSections.Media]: 'Media fayllar',
 				[AdminSections.ShiftTemplates]: 'Smena shablonlari',
-				[AdminSections.PauseTemplates]: 'Pauza shablonlari',
-				[AdminSections.WorkingConditions]: 'Ish sharoitlari',
 				[AdminSections.Blacklist]: "Ro'yxatlar",
 				[AdminSections.Calendars]: 'Taqvimlar',
 				[AdminSections.Regions]: 'Joylashuvlar',
@@ -460,6 +458,8 @@ export default {
 				[WfmSections.Agents]: 'Agentlar',
 				[WfmSections.Schedules]: 'Jadvalar',
 				[WfmSections.ForecastCalculation]: 'Prognozni hisoblash',
+				[WfmSections.PauseTemplates]: 'Pauza shablonlari',
+				[WfmSections.WorkingConditions]: 'Ish sharoitlari',
 			},
 		},
 		[WtApplication.Meet]: {

package/src/locale/vi/vi.js

@@ -425,8 +425,6 @@ export default {
 				[AdminSections.Buckets]: 'Vùng chứa',
 				[AdminSections.Media]: 'Tệp đa phương tiện',
 				[AdminSections.ShiftTemplates]: 'Mẫu ca làm việc',
-				[AdminSections.PauseTemplates]: 'Mẫu tạm dừng',
-				[AdminSections.WorkingConditions]: 'Điều kiện làm việc',
 				[AdminSections.Blacklist]: 'Danh sách',
 				[AdminSections.Calendars]: 'Lịch',
 				[AdminSections.Regions]: 'Địa điểm',
@@ -460,6 +458,8 @@ export default {
 				[WfmSections.Agents]: 'Đại lý',
 				[WfmSections.Schedules]: 'Lịch trình',
 				[WfmSections.ForecastCalculation]: 'Tính toán dự báo',
+				[WfmSections.PauseTemplates]: 'Mẫu tạm dừng',
+				[WfmSections.WorkingConditions]: 'Điều kiện làm việc',
 			},
 		},
 		[WtApplication.Meet]: {

package/src/modules/Userinfo/classes/ApplicationsAccess.ts

@@ -139,10 +139,6 @@ const applicationsAccess = (value = true): ApplicationsAccessSchema => ({
 			_enabled: value,
 			_locale: `WtApplication.${WtApplication.Admin}.sections.${AdminSections.Media}`,
 		},
-		[AdminSections.ShiftTemplates]: {
-			_enabled: value,
-			_locale: `WtApplication.${WtApplication.Admin}.sections.${AdminSections.ShiftTemplates}`,
-		},
 		[AdminSections.PauseTemplates]: {
 			_enabled: value,
 			_locale: `WtApplication.${WtApplication.Admin}.sections.${AdminSections.PauseTemplates}`,
@@ -299,6 +295,10 @@ const applicationsAccess = (value = true): ApplicationsAccessSchema => ({
 			_enabled: value,
 			_locale: `WtApplication.${WtApplication.Wfm}.sections.${WfmSections.ForecastCalculation}`,
 		},
+		[WfmSections.ShiftTemplates]: {
+			_enabled: value,
+			_locale: `WtApplication.${WtApplication.Wfm}.sections.${WfmSections.ShiftTemplates}`,
+		},
 	},
 });
 

package/src/modules/Userinfo/classes/__tests__/ApplicationsAccess.spec.ts

@@ -7,6 +7,7 @@ const wfmSections = [
 	WfmSections.Agents,
 	WfmSections.Schedules,
 	WfmSections.ForecastCalculation,
+	WfmSections.ShiftTemplates,
 ];
 
 describe('ApplicationsAccess', () => {
@@ -28,9 +29,6 @@ describe('ApplicationsAccess', () => {
 	it('does not include lookups that are not moved to WFM yet', () => {
 		const { access } = new ApplicationsAccess();
 
-		expect(
-			access[WtApplication.Wfm][WfmSections.ShiftTemplates],
-		).toBeUndefined();
 		expect(
 			access[WtApplication.Wfm][WfmSections.PauseTemplates],
 		).toBeUndefined();

package/src/modules/Userinfo/mappings/__tests__/mappings.spec.ts

@@ -16,17 +16,20 @@ describe('mapWtObjectToUiSection', () => {
 	});
 
 	it('keeps Admin mapping for lookups that are not moved to WFM yet', () => {
-		expect(
-			castWtObjectToUiSection(WtApplication.Admin, WtObject.ShiftTemplate),
-		).toBe(AdminSections.ShiftTemplates);
 		expect(
 			castWtObjectToUiSection(WtApplication.Admin, WtObject.PauseTemplate),
 		).toBe(AdminSections.PauseTemplates);
 		expect(
 			castWtObjectToUiSection(WtApplication.Admin, WtObject.WorkingCondition),
 		).toBe(AdminSections.WorkingConditions);
+	});
+
+	it('maps shift templates to WFM only', () => {
 		expect(
 			castWtObjectToUiSection(WtApplication.Wfm, WtObject.ShiftTemplate),
+		).toBe(WfmSections.ShiftTemplates);
+		expect(
+			castWtObjectToUiSection(WtApplication.Admin, WtObject.ShiftTemplate),
 		).toBeUndefined();
 	});
 });

package/src/modules/Userinfo/mappings/mappings.ts

@@ -241,7 +241,6 @@ export const mapWtObjectToUiSection: Partial<
 		[WtObject.ChangeLog]: AdminSections.Changelogs,
 		[WtObject.Configuration]: AdminSections.Configuration,
 		[WtObject.GlobalVariable]: AdminSections.GlobalVariables,
-		[WtObject.ShiftTemplate]: AdminSections.ShiftTemplates,
 		[WtObject.PauseTemplate]: AdminSections.PauseTemplates,
 		[WtObject.WorkingCondition]: AdminSections.WorkingConditions,
 		[WtObject.Member]: AdminSections.Members,
@@ -279,6 +278,7 @@ export const mapWtObjectToUiSection: Partial<
 	// Wfm sections
 	[WtApplication.Wfm]: {
 		[WtObject.Agent]: WfmSections.Agents,
+		[WtObject.ShiftTemplate]: WfmSections.ShiftTemplates,
 	},
 };
 

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;