aril 1.2.24 → 1.2.25

package/theme/layout/app/history/history.service.ts

@@ -1,158 +1,158 @@
-import { Injectable, inject } from '@angular/core';
-import { Router } from '@angular/router';
-import { Title } from '@angular/platform-browser';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { TranslocoService } from '@ngneat/transloco';
-import { bridge } from 'aril/boot/bridge';
-import { PubSubService } from 'aril/util/pub-sub';
-
-export interface HistoryItem {
-	id: string;
-	title: string;
-	multiLanguageTitle?: {
-		tr?: string;
-		en?: string;
-	};
-	url: string;
-	timestamp: number;
-}
-
-@Injectable({
-	providedIn: 'root'
-})
-export class HistoryService {
-	private readonly STORAGE_KEY = 'page_history';
-	private readonly MAX_HISTORY_SIZE = 20;
-
-	private historySubject = new BehaviorSubject<HistoryItem[]>([]);
-	public history$: Observable<HistoryItem[]> = this.historySubject.asObservable();;
-
-	// Excluded paths that shouldn't be tracked
-	private excludedPaths = ['/login'];
-
-	private router = inject(Router);
-	private translocoService = inject(TranslocoService);
-	private pubSubService = inject(PubSubService);
-	private titleService = inject(Title);
-
-	constructor() {
-		this.loadHistoryFromStorage();
-		this.initializeBreadcrumbListener();
-	}
-
-	private initializeBreadcrumbListener(): void {
-		// Listen for breadcrumb updates to track navigation history
-		this.pubSubService.subscribe('breadcrumbUpdated', (data) => {
-			const url = data?.path;
-			const pageTitle = data?.custom?.pageTitle;
-			
-			if (url && pageTitle && pageTitle !== '...') {
-				this.addToHistory(url, pageTitle);
-				this.titleService.setTitle(pageTitle);
-			}
-		});
-	}
-
-	private addToHistory(url: string, pageTitle?: string): void {
-		if (this.shouldExcludeUrl(url)) {
-			return;
-		}
-
-		const multiLanguageTitle: { tr?: string; en?: string } = {};
-
-		 if (pageTitle) {
-			multiLanguageTitle.tr = pageTitle;
-			multiLanguageTitle.en = pageTitle;
-		} else {
-			const globalPageTitle = bridge.pageTitle();
-			if (globalPageTitle) {
-				multiLanguageTitle.tr = globalPageTitle;
-				multiLanguageTitle.en = globalPageTitle;
-			} else {
-				// Fallback for pages not in menu and no global title
-				multiLanguageTitle.tr = 'Bilinmeyen Sayfa';
-				multiLanguageTitle.en = 'Unknown Page';
-			}
-		}
-
-		const currentLang = this.translocoService.getActiveLang() as 'tr' | 'en';
-		const title = multiLanguageTitle[currentLang] || multiLanguageTitle.tr || 'Unknown Page';
-		const timestamp = Date.now();
-		const id = this.generateId(url, timestamp);
-
-		const newItem: HistoryItem = {
-			id,
-			title,
-			multiLanguageTitle,
-			url,
-			timestamp
-		};
-
-		let history = this.getHistoryFromStorage();
-		history = history.filter((item) => item.url !== url);
-		history.unshift(newItem);
-
-		// Limit history size
-		if (history.length > this.MAX_HISTORY_SIZE) {
-			history = history.slice(0, this.MAX_HISTORY_SIZE);
-		}
-
-		this.saveHistoryToStorage(history);
-		this.historySubject.next(history);
-	}
-
-	private shouldExcludeUrl(url: string): boolean {
-		return this.excludedPaths.some((excludedPath) => url.startsWith(excludedPath));
-	}
-
-	private generateId(url: string, timestamp: number): string {
-		return `${url.replace(/[^a-zA-Z0-9]/g, '_')}_${timestamp}`;
-	}
-
-	private loadHistoryFromStorage(): void {
-		const history = this.getHistoryFromStorage();
-		this.historySubject.next(history);
-	}
-
-	private saveHistoryToStorage(history: HistoryItem[]): void {
-		try {
-			localStorage.setItem(this.STORAGE_KEY, JSON.stringify(history));
-		} catch (error) {
-			console.warn('Failed to save navigation history to localStorage:', error);
-		}
-	}
-
-	public clearHistory(): void {
-		localStorage.removeItem(this.STORAGE_KEY);
-		this.historySubject.next([]);
-	}
-
-	public navigateToHistoryItem(item: HistoryItem): void {
-		this.router.navigate([item.url]);
-	}
-
-	private getHistoryFromStorage(): HistoryItem[] {
-		try {
-			const stored = localStorage.getItem(this.STORAGE_KEY);
-			return stored ? JSON.parse(stored) : [];
-		} catch (error) {
-			console.warn('Failed to load navigation history from localStorage:', error);
-			return [];
-		}
-	}
-
-	public getHistoryItemsBySearchTerm(searchTerm: string): HistoryItem[] {
-		const history = this.getHistoryFromStorage();
-		const currentLang = this.translocoService.getActiveLang() as 'tr' | 'en';
-		const lowerSearchTerm = searchTerm.toLocaleLowerCase(currentLang);
-
-		return history.filter((item) => {
-			// Search in current language title
-			const currentTitle = item.multiLanguageTitle?.[currentLang] || item.title;
-			return (
-				currentTitle.toLocaleLowerCase(currentLang).includes(lowerSearchTerm) ||
-				item.url.toLocaleLowerCase(currentLang).includes(lowerSearchTerm)
-			);
-		});
-	}
-}
+import { Injectable, inject } from '@angular/core';
+import { Router } from '@angular/router';
+import { Title } from '@angular/platform-browser';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { TranslocoService } from '@ngneat/transloco';
+import { bridge } from 'aril/boot/bridge';
+import { PubSubService } from 'aril/util/pub-sub';
+
+export interface HistoryItem {
+	id: string;
+	title: string;
+	multiLanguageTitle?: {
+		tr?: string;
+		en?: string;
+	};
+	url: string;
+	timestamp: number;
+}
+
+@Injectable({
+	providedIn: 'root'
+})
+export class HistoryService {
+	private readonly STORAGE_KEY = 'page_history';
+	private readonly MAX_HISTORY_SIZE = 20;
+
+	private historySubject = new BehaviorSubject<HistoryItem[]>([]);
+	public history$: Observable<HistoryItem[]> = this.historySubject.asObservable();;
+
+	// Excluded paths that shouldn't be tracked
+	private excludedPaths = ['/login'];
+
+	private router = inject(Router);
+	private translocoService = inject(TranslocoService);
+	private pubSubService = inject(PubSubService);
+	private titleService = inject(Title);
+
+	constructor() {
+		this.loadHistoryFromStorage();
+		this.initializeBreadcrumbListener();
+	}
+
+	private initializeBreadcrumbListener(): void {
+		// Listen for breadcrumb updates to track navigation history
+		this.pubSubService.subscribe('breadcrumbUpdated', (data) => {
+			const url = data?.path;
+			const pageTitle = data?.custom?.pageTitle;
+			
+			if (url && pageTitle && pageTitle !== '...') {
+				this.addToHistory(url, pageTitle);
+				this.titleService.setTitle(pageTitle);
+			}
+		});
+	}
+
+	private addToHistory(url: string, pageTitle?: string): void {
+		if (this.shouldExcludeUrl(url)) {
+			return;
+		}
+
+		const multiLanguageTitle: { tr?: string; en?: string } = {};
+
+		 if (pageTitle) {
+			multiLanguageTitle.tr = pageTitle;
+			multiLanguageTitle.en = pageTitle;
+		} else {
+			const globalPageTitle = bridge.pageTitle();
+			if (globalPageTitle) {
+				multiLanguageTitle.tr = globalPageTitle;
+				multiLanguageTitle.en = globalPageTitle;
+			} else {
+				// Fallback for pages not in menu and no global title
+				multiLanguageTitle.tr = 'Bilinmeyen Sayfa';
+				multiLanguageTitle.en = 'Unknown Page';
+			}
+		}
+
+		const currentLang = this.translocoService.getActiveLang() as 'tr' | 'en';
+		const title = multiLanguageTitle[currentLang] || multiLanguageTitle.tr || 'Unknown Page';
+		const timestamp = Date.now();
+		const id = this.generateId(url, timestamp);
+
+		const newItem: HistoryItem = {
+			id,
+			title,
+			multiLanguageTitle,
+			url,
+			timestamp
+		};
+
+		let history = this.getHistoryFromStorage();
+		history = history.filter((item) => item.url !== url);
+		history.unshift(newItem);
+
+		// Limit history size
+		if (history.length > this.MAX_HISTORY_SIZE) {
+			history = history.slice(0, this.MAX_HISTORY_SIZE);
+		}
+
+		this.saveHistoryToStorage(history);
+		this.historySubject.next(history);
+	}
+
+	private shouldExcludeUrl(url: string): boolean {
+		return this.excludedPaths.some((excludedPath) => url.startsWith(excludedPath));
+	}
+
+	private generateId(url: string, timestamp: number): string {
+		return `${url.replace(/[^a-zA-Z0-9]/g, '_')}_${timestamp}`;
+	}
+
+	private loadHistoryFromStorage(): void {
+		const history = this.getHistoryFromStorage();
+		this.historySubject.next(history);
+	}
+
+	private saveHistoryToStorage(history: HistoryItem[]): void {
+		try {
+			localStorage.setItem(this.STORAGE_KEY, JSON.stringify(history));
+		} catch (error) {
+			console.warn('Failed to save navigation history to localStorage:', error);
+		}
+	}
+
+	public clearHistory(): void {
+		localStorage.removeItem(this.STORAGE_KEY);
+		this.historySubject.next([]);
+	}
+
+	public navigateToHistoryItem(item: HistoryItem): void {
+		this.router.navigate([item.url]);
+	}
+
+	private getHistoryFromStorage(): HistoryItem[] {
+		try {
+			const stored = localStorage.getItem(this.STORAGE_KEY);
+			return stored ? JSON.parse(stored) : [];
+		} catch (error) {
+			console.warn('Failed to load navigation history from localStorage:', error);
+			return [];
+		}
+	}
+
+	public getHistoryItemsBySearchTerm(searchTerm: string): HistoryItem[] {
+		const history = this.getHistoryFromStorage();
+		const currentLang = this.translocoService.getActiveLang() as 'tr' | 'en';
+		const lowerSearchTerm = searchTerm.toLocaleLowerCase(currentLang);
+
+		return history.filter((item) => {
+			// Search in current language title
+			const currentTitle = item.multiLanguageTitle?.[currentLang] || item.title;
+			return (
+				currentTitle.toLocaleLowerCase(currentLang).includes(lowerSearchTerm) ||
+				item.url.toLocaleLowerCase(currentLang).includes(lowerSearchTerm)
+			);
+		});
+	}
+}

package/theme/layout/app/layout/app.layout.component.ts

@@ -1,169 +1,169 @@
-import { NgClass } from '@angular/common';
-import { Component, OnDestroy, Renderer2, ViewChild } from '@angular/core';
-import { NavigationEnd, Router, RouterOutlet } from '@angular/router';
-
-import { ConfirmDialogModule } from 'primeng/confirmdialog';
-import { ConfirmPopupModule } from 'primeng/confirmpopup';
-import { DialogModule } from 'primeng/dialog';
-import { MessagesModule } from 'primeng/messages';
-import { ToastModule } from 'primeng/toast';
-
-import { Subscription, filter } from 'rxjs';
-
-import { LayoutService } from '../../service/app.layout.service';
-import { AppMenuService } from '../../service/app.menu.service';
-import { AppProfileSidebarComponent } from '../profileSidebar/app.profilesidebar.component';
-import { HistorySidebarComponent } from '../history/history-sidebar.component';
-import { SiteMapSidebarComponent } from '../site-map/site-map-sidebar.component';
-import { FavoritePagesSidebarComponent } from '../favorite-pages/favorite-pages-sidebar.component';
-import { AppTopbarComponent } from '../topbar/app.topbar.component';
-import { ExpandableMenuComponent } from '../expandableMenu/expandable-menu.component';
-import { StaticSidebarComponent } from '../static-sidebar/static-sidebar.component';
-import { NotificationsSidebarComponent } from '../notifications/notifications-sidebar.component';
-
-@Component({
-	standalone: true,
-	selector: 'app-layout',
-	imports: [
-		NgClass,
-		RouterOutlet,
-		ConfirmDialogModule,
-		ConfirmPopupModule,
-		DialogModule,
-		MessagesModule,
-		ToastModule,
-		AppTopbarComponent,
-		AppProfileSidebarComponent,
-		HistorySidebarComponent,
-		SiteMapSidebarComponent,
-		FavoritePagesSidebarComponent,
-		ExpandableMenuComponent,
-		StaticSidebarComponent,
-		NotificationsSidebarComponent
-	],
-	templateUrl: './app.layout.component.html'
-})
-export class AppLayoutComponent implements OnDestroy {
-	overlayMenuOpenSubscription: Subscription;
-	menuOutsideClickListener: any;
-	menuScrollListener: any;
-
-	@ViewChild(ExpandableMenuComponent) expandableMenuComponent!: ExpandableMenuComponent;
-	@ViewChild(StaticSidebarComponent) staticSidebarComponent!: StaticSidebarComponent;
-	@ViewChild(AppTopbarComponent) appTopbar!: AppTopbarComponent;
-
-	constructor(
-		private menuService: AppMenuService,
-		public layoutService: LayoutService,
-		public renderer: Renderer2,
-		public router: Router
-	) {
-		this.overlayMenuOpenSubscription = this.layoutService.overlayOpen$.subscribe(() => {
-			if (!this.menuOutsideClickListener) {
-				this.menuOutsideClickListener = this.renderer.listen('document', 'click', (event) => {
-					const isOutsideClicked = !(
-						this.appTopbar.menuButton.nativeElement.isSameNode(event.target) ||
-						this.appTopbar.menuButton.nativeElement.contains(event.target) ||
-						(this.expandableMenuComponent && this.isElementInside(event.target, 'app-expandable-menu')) ||
-						(this.staticSidebarComponent && this.isElementInside(event.target, 'app-static-sidebar'))
-					);
-					if (isOutsideClicked) {
-						this.hideMenu();
-					}
-				});
-			}
-
-			if (this.layoutService.state.staticMenuMobileActive) {
-				this.blockBodyScroll();
-			}
-		});
-
-		this.router.events.pipe(filter((event) => event instanceof NavigationEnd)).subscribe(() => {
-			if (!this.layoutService.mfeAppItemClicked()) this.hideMenu();
-		});
-	}
-
-	blockBodyScroll(): void {
-		if (document.body.classList) {
-			document.body.classList.add('blocked-scroll');
-		} else {
-			document.body.className += ' blocked-scroll';
-		}
-	}
-
-	unblockBodyScroll(): void {
-		if (document.body.classList) {
-			document.body.classList.remove('blocked-scroll');
-		} else {
-			document.body.className = document.body.className.replace(
-				new RegExp('(^|\\b)' + 'blocked-scroll'.split(' ').join('|') + '(\\b|$)', 'gi'),
-				' '
-			);
-		}
-	}
-
-	// Helper method to check if element is inside a specific component
-	private isElementInside(element: any, selector: string): boolean {
-		if (!element) return false;
-		
-		let currentElement = element;
-		while (currentElement && currentElement !== document) {
-			if (currentElement.tagName && currentElement.tagName.toLowerCase() === selector) {
-				return true;
-			}
-			currentElement = currentElement.parentElement;
-		}
-		return false;
-	}
-
-	hideMenu() {
-		this.layoutService.state.staticMenuMobileActive = false;
-		this.menuService.reset();
-
-		if (this.menuOutsideClickListener) {
-			this.menuOutsideClickListener();
-			this.menuOutsideClickListener = null;
-		}
-
-		if (this.menuScrollListener) {
-			this.menuScrollListener();
-			this.menuScrollListener = null;
-		}
-
-		this.unblockBodyScroll();
-	}
-
-	get containerClass() {
-		return {
-			'layout-light': this.layoutService.config().colorScheme === 'light',
-			'layout-dim': this.layoutService.config().colorScheme === 'dim',
-			'layout-dark': this.layoutService.config().colorScheme === 'dark',
-			'layout-colorscheme-menu': this.layoutService.config().menuTheme === 'colorScheme',
-			'layout-primarycolor-menu': this.layoutService.config().menuTheme === 'primaryColor',
-			'layout-transparent-menu': this.layoutService.config().menuTheme === 'transparent',
-			'layout-static': this.layoutService.config().menuMode === 'static',
-			'layout-expandable': this.layoutService.config().menuMode === 'expandable',
-			'layout-static-inactive': 
-				this.layoutService.config().menuMode === 'static' && 
-				!this.layoutService.shouldShowStaticSidebar(),
-			'layout-static-collapsed': 
-				this.layoutService.config().menuMode === 'static' && 
-				this.layoutService.isStaticSidebarCollapsed(),
-			'layout-mobile-active': this.layoutService.state.staticMenuMobileActive,
-			'p-input-filled': this.layoutService.config().inputStyle === 'filled',
-			'p-ripple-disabled': !this.layoutService.config().ripple,
-			'new-sidebar-layout': this.layoutService.config().menuMode === 'expandable',
-			'secondary-expanded': this.layoutService.state.secondarySidebarExpanded
-		};
-	}
-
-	ngOnDestroy() {
-		if (this.overlayMenuOpenSubscription) {
-			this.overlayMenuOpenSubscription.unsubscribe();
-		}
-
-		if (this.menuOutsideClickListener) {
-			this.menuOutsideClickListener();
-		}
-	}
+import { NgClass } from '@angular/common';
+import { Component, OnDestroy, Renderer2, ViewChild } from '@angular/core';
+import { NavigationEnd, Router, RouterOutlet } from '@angular/router';
+
+import { ConfirmDialogModule } from 'primeng/confirmdialog';
+import { ConfirmPopupModule } from 'primeng/confirmpopup';
+import { DialogModule } from 'primeng/dialog';
+import { MessagesModule } from 'primeng/messages';
+import { ToastModule } from 'primeng/toast';
+
+import { Subscription, filter } from 'rxjs';
+
+import { LayoutService } from '../../service/app.layout.service';
+import { AppMenuService } from '../../service/app.menu.service';
+import { AppProfileSidebarComponent } from '../profileSidebar/app.profilesidebar.component';
+import { HistorySidebarComponent } from '../history/history-sidebar.component';
+import { SiteMapSidebarComponent } from '../site-map/site-map-sidebar.component';
+import { FavoritePagesSidebarComponent } from '../favorite-pages/favorite-pages-sidebar.component';
+import { AppTopbarComponent } from '../topbar/app.topbar.component';
+import { ExpandableMenuComponent } from '../expandableMenu/expandable-menu.component';
+import { StaticSidebarComponent } from '../static-sidebar/static-sidebar.component';
+import { NotificationsSidebarComponent } from '../notifications/notifications-sidebar.component';
+
+@Component({
+	standalone: true,
+	selector: 'app-layout',
+	imports: [
+		NgClass,
+		RouterOutlet,
+		ConfirmDialogModule,
+		ConfirmPopupModule,
+		DialogModule,
+		MessagesModule,
+		ToastModule,
+		AppTopbarComponent,
+		AppProfileSidebarComponent,
+		HistorySidebarComponent,
+		SiteMapSidebarComponent,
+		FavoritePagesSidebarComponent,
+		ExpandableMenuComponent,
+		StaticSidebarComponent,
+		NotificationsSidebarComponent
+	],
+	templateUrl: './app.layout.component.html'
+})
+export class AppLayoutComponent implements OnDestroy {
+	overlayMenuOpenSubscription: Subscription;
+	menuOutsideClickListener: any;
+	menuScrollListener: any;
+
+	@ViewChild(ExpandableMenuComponent) expandableMenuComponent!: ExpandableMenuComponent;
+	@ViewChild(StaticSidebarComponent) staticSidebarComponent!: StaticSidebarComponent;
+	@ViewChild(AppTopbarComponent) appTopbar!: AppTopbarComponent;
+
+	constructor(
+		private menuService: AppMenuService,
+		public layoutService: LayoutService,
+		public renderer: Renderer2,
+		public router: Router
+	) {
+		this.overlayMenuOpenSubscription = this.layoutService.overlayOpen$.subscribe(() => {
+			if (!this.menuOutsideClickListener) {
+				this.menuOutsideClickListener = this.renderer.listen('document', 'click', (event) => {
+					const isOutsideClicked = !(
+						this.appTopbar.menuButton.nativeElement.isSameNode(event.target) ||
+						this.appTopbar.menuButton.nativeElement.contains(event.target) ||
+						(this.expandableMenuComponent && this.isElementInside(event.target, 'app-expandable-menu')) ||
+						(this.staticSidebarComponent && this.isElementInside(event.target, 'app-static-sidebar'))
+					);
+					if (isOutsideClicked) {
+						this.hideMenu();
+					}
+				});
+			}
+
+			if (this.layoutService.state.staticMenuMobileActive) {
+				this.blockBodyScroll();
+			}
+		});
+
+		this.router.events.pipe(filter((event) => event instanceof NavigationEnd)).subscribe(() => {
+			if (!this.layoutService.mfeAppItemClicked()) this.hideMenu();
+		});
+	}
+
+	blockBodyScroll(): void {
+		if (document.body.classList) {
+			document.body.classList.add('blocked-scroll');
+		} else {
+			document.body.className += ' blocked-scroll';
+		}
+	}
+
+	unblockBodyScroll(): void {
+		if (document.body.classList) {
+			document.body.classList.remove('blocked-scroll');
+		} else {
+			document.body.className = document.body.className.replace(
+				new RegExp('(^|\\b)' + 'blocked-scroll'.split(' ').join('|') + '(\\b|$)', 'gi'),
+				' '
+			);
+		}
+	}
+
+	// Helper method to check if element is inside a specific component
+	private isElementInside(element: any, selector: string): boolean {
+		if (!element) return false;
+		
+		let currentElement = element;
+		while (currentElement && currentElement !== document) {
+			if (currentElement.tagName && currentElement.tagName.toLowerCase() === selector) {
+				return true;
+			}
+			currentElement = currentElement.parentElement;
+		}
+		return false;
+	}
+
+	hideMenu() {
+		this.layoutService.state.staticMenuMobileActive = false;
+		this.menuService.reset();
+
+		if (this.menuOutsideClickListener) {
+			this.menuOutsideClickListener();
+			this.menuOutsideClickListener = null;
+		}
+
+		if (this.menuScrollListener) {
+			this.menuScrollListener();
+			this.menuScrollListener = null;
+		}
+
+		this.unblockBodyScroll();
+	}
+
+	get containerClass() {
+		return {
+			'layout-light': this.layoutService.config().colorScheme === 'light',
+			'layout-dim': this.layoutService.config().colorScheme === 'dim',
+			'layout-dark': this.layoutService.config().colorScheme === 'dark',
+			'layout-colorscheme-menu': this.layoutService.config().menuTheme === 'colorScheme',
+			'layout-primarycolor-menu': this.layoutService.config().menuTheme === 'primaryColor',
+			'layout-transparent-menu': this.layoutService.config().menuTheme === 'transparent',
+			'layout-static': this.layoutService.config().menuMode === 'static',
+			'layout-expandable': this.layoutService.config().menuMode === 'expandable',
+			'layout-static-inactive': 
+				this.layoutService.config().menuMode === 'static' && 
+				!this.layoutService.shouldShowStaticSidebar(),
+			'layout-static-collapsed': 
+				this.layoutService.config().menuMode === 'static' && 
+				this.layoutService.isStaticSidebarCollapsed(),
+			'layout-mobile-active': this.layoutService.state.staticMenuMobileActive,
+			'p-input-filled': this.layoutService.config().inputStyle === 'filled',
+			'p-ripple-disabled': !this.layoutService.config().ripple,
+			'new-sidebar-layout': this.layoutService.config().menuMode === 'expandable',
+			'secondary-expanded': this.layoutService.state.secondarySidebarExpanded
+		};
+	}
+
+	ngOnDestroy() {
+		if (this.overlayMenuOpenSubscription) {
+			this.overlayMenuOpenSubscription.unsubscribe();
+		}
+
+		if (this.menuOutsideClickListener) {
+			this.menuOutsideClickListener();
+		}
+	}
 }