aril 1.1.65 → 1.1.67

package/theme/layout/app/favorite-pages/favorite-pages.service.ts

@@ -1,95 +1,95 @@
-import { Injectable, signal } from '@angular/core';
-import { Router } from '@angular/router';
-
-import { Observable } from 'rxjs';
-
-import { HTTPMethods, ProxyTypes, RestClient, ServiceCall, ServiceCallStateMap, ServiceResponse } from 'aril/http';
-
-export interface FavoritePageResponseDTO {
-	id: number;
-	creator: string;
-	created: number;
-	updater: string;
-	updated: number;
-	version: number;
-	username: string;
-	url: string;
-	label: string;
-}
-
-export interface FavoritePageSaveRequestDTO {
-	url: string;
-	label: string;
-}
-
-export interface FavoritePageUpdateRequestDTO {
-	label: string;
-	version: number;
-}
-
-export interface FavoritePageFilterRequestDTO {
-	pageSize?: number;
-	pageNumber?: number;
-	sortFieldName?: string;
-	sortDirection?: number; // 1=ASC, 2=DESC
-}
-
-export interface SearchResultDTO<T> {
-	resultInfo: {
-		totalPage: number;
-		totalItem: number;
-	};
-	result: T[];
-	searchAfterValues: any[];
-}
-
-// API Endpoints
-export const favoritePageEndpoints = {
-	filter: 'favorite-pages/filter',
-	favorite: 'favorite-pages'
-};
-
-@Injectable({ providedIn: 'root' })
-export class FavoritePagesService extends RestClient {
-	override states: ServiceCallStateMap<FavoritePagesService> = {};
-	allFavoritePages = signal<FavoritePageResponseDTO[]>([]);
-
-	constructor(private router: Router) {
-		super();
-	}
-
-	getCurrentRoutePath(): string {
-		return this.router.url;
-	}
-
-	navigateToFavoritePage(favorite: FavoritePageResponseDTO): void {
-		this.router.navigate([favorite.url]);
-	}
-
-	getFullUrl(url: string): string {
-		const baseUrl = window.location.origin;
-		return `${baseUrl}${window.location.pathname}${"#"}${url}`;
-	}
-
-
-
-	@ServiceCall(HTTPMethods.POST, ProxyTypes.ClientSide, favoritePageEndpoints.filter)
-	filterFavoritePages(post: FavoritePageFilterRequestDTO) {
-		return new Observable<ServiceResponse<SearchResultDTO<FavoritePageResponseDTO>>>();
-	}
-
-	@ServiceCall(HTTPMethods.POST, ProxyTypes.ClientSide, favoritePageEndpoints.favorite)
-	saveFavoritePage(post: FavoritePageSaveRequestDTO) {
-		return new Observable<ServiceResponse<FavoritePageResponseDTO>>();
-	}
-
-	@ServiceCall(HTTPMethods.PUT, ProxyTypes.ClientSide, favoritePageEndpoints.favorite)
-	updateFavoritePage(id: number, post: FavoritePageUpdateRequestDTO) {
-		return new Observable<ServiceResponse<FavoritePageResponseDTO>>();
-	}
-
-	@ServiceCall(HTTPMethods.DELETE, ProxyTypes.ClientSide, favoritePageEndpoints.favorite)
-	deleteFavoritePage(id: number) {
-		return new Observable<ServiceResponse<boolean>>();
-	}
-}
+import { Injectable, signal } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { Observable } from 'rxjs';
+
+import { HTTPMethods, ProxyTypes, RestClient, ServiceCall, ServiceCallStateMap, ServiceResponse } from 'aril/http';
+
+export interface FavoritePageResponseDTO {
+	id: number;
+	creator: string;
+	created: number;
+	updater: string;
+	updated: number;
+	version: number;
+	username: string;
+	url: string;
+	label: string;
+}
+
+export interface FavoritePageSaveRequestDTO {
+	url: string;
+	label: string;
+}
+
+export interface FavoritePageUpdateRequestDTO {
+	label: string;
+	version: number;
+}
+
+export interface FavoritePageFilterRequestDTO {
+	pageSize?: number;
+	pageNumber?: number;
+	sortFieldName?: string;
+	sortDirection?: number; // 1=ASC, 2=DESC
+}
+
+export interface SearchResultDTO<T> {
+	resultInfo: {
+		totalPage: number;
+		totalItem: number;
+	};
+	result: T[];
+	searchAfterValues: any[];
+}
+
+// API Endpoints
+export const favoritePageEndpoints = {
+	filter: 'favorite-pages/filter',
+	favorite: 'favorite-pages'
+};
+
+@Injectable({ providedIn: 'root' })
+export class FavoritePagesService extends RestClient {
+	override states: ServiceCallStateMap<FavoritePagesService> = {};
+	allFavoritePages = signal<FavoritePageResponseDTO[]>([]);
+
+	constructor(private router: Router) {
+		super();
+	}
+
+	getCurrentRoutePath(): string {
+		return this.router.url;
+	}
+
+	navigateToFavoritePage(favorite: FavoritePageResponseDTO): void {
+		this.router.navigate([favorite.url]);
+	}
+
+	getFullUrl(url: string): string {
+		const baseUrl = window.location.origin;
+		return `${baseUrl}${window.location.pathname}${"#"}${url}`;
+	}
+
+
+
+	@ServiceCall(HTTPMethods.POST, ProxyTypes.ClientSide, favoritePageEndpoints.filter)
+	filterFavoritePages(post: FavoritePageFilterRequestDTO) {
+		return new Observable<ServiceResponse<SearchResultDTO<FavoritePageResponseDTO>>>();
+	}
+
+	@ServiceCall(HTTPMethods.POST, ProxyTypes.ClientSide, favoritePageEndpoints.favorite)
+	saveFavoritePage(post: FavoritePageSaveRequestDTO) {
+		return new Observable<ServiceResponse<FavoritePageResponseDTO>>();
+	}
+
+	@ServiceCall(HTTPMethods.PUT, ProxyTypes.ClientSide, favoritePageEndpoints.favorite)
+	updateFavoritePage(id: number, post: FavoritePageUpdateRequestDTO) {
+		return new Observable<ServiceResponse<FavoritePageResponseDTO>>();
+	}
+
+	@ServiceCall(HTTPMethods.DELETE, ProxyTypes.ClientSide, favoritePageEndpoints.favorite)
+	deleteFavoritePage(id: number) {
+		return new Observable<ServiceResponse<boolean>>();
+	}
+}

package/theme/layout/app/favorite-pages/modals/add-edit-favorite-modal/add-edit-favorite-modal.component.html

@@ -1,27 +1,27 @@
-<div *transloco="let t; read: 'favoritePages'">
-	<aril-form [formGroup]="favoriteForm">
-		<aril-field [label]="t('label')" [cols]="{ xl: 12, lg: 12, md: 12, sm: 12 }" [markAsRequired]="true">
-			<aril-text formControlName="label" [placeholder]="t('labelPlaceholder')"> </aril-text>
-		</aril-field>
-
-		<aril-field [label]="t('path')" [cols]="{ xl: 12, lg: 12, md: 12, sm: 12 }">
-			<aril-text formControlName="url"> </aril-text>
-		</aril-field>
-
-		<div class="col-12 flex justify-content-end mt-4 gap-2">
-			<aril-button
-				color="danger"
-				[label]="t('cancel')"
-				[outlined]="true"
-				icon="TIMES"
-				(clickEvent)="cancel()">
-			</aril-button>
-			<aril-form-submit
-				[label]="t('save')"
-				color="success"
-				icon="CHECK"
-				[formGroup]="favoriteForm"
-				(validEvent)="submit()" />
-		</div>
-	</aril-form>
-</div>
+<div *transloco="let t; read: 'favoritePages'">
+	<aril-form [formGroup]="favoriteForm">
+		<aril-field [label]="t('label')" [cols]="{ xl: 12, lg: 12, md: 12, sm: 12 }" [markAsRequired]="true">
+			<aril-text formControlName="label" [placeholder]="t('labelPlaceholder')"> </aril-text>
+		</aril-field>
+
+		<aril-field [label]="t('path')" [cols]="{ xl: 12, lg: 12, md: 12, sm: 12 }">
+			<aril-text formControlName="url"> </aril-text>
+		</aril-field>
+
+		<div class="col-12 flex justify-content-end mt-4 gap-2">
+			<aril-button
+				color="danger"
+				[label]="t('cancel')"
+				[outlined]="true"
+				icon="TIMES"
+				(clickEvent)="cancel()">
+			</aril-button>
+			<aril-form-submit
+				[label]="t('save')"
+				color="success"
+				icon="CHECK"
+				[formGroup]="favoriteForm"
+				(validEvent)="submit()" />
+		</div>
+	</aril-form>
+</div>

package/theme/layout/app/favorite-pages/modals/add-edit-favorite-modal/add-edit-favorite-modal.component.ts

@@ -1,165 +1,165 @@
-import { CommonModule } from '@angular/common';
-import { Component, OnInit, effect } from '@angular/core';
-import { toSignal } from '@angular/core/rxjs-interop';
-import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
-
-import { MessageService } from 'primeng/api';
-import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
-
-import { TranslocoModule, TranslocoService } from '@ngneat/transloco';
-import { Subject, switchMap } from 'rxjs';
-
-import { ButtonComponent } from 'aril/ui/button';
-import { FieldComponent } from 'aril/ui/field';
-import { ARiLFormModule } from 'aril/ui/form';
-import { TextComponent } from 'aril/ui/text';
-
-import {
-	FavoritePageResponseDTO,
-	FavoritePageSaveRequestDTO,
-	FavoritePageUpdateRequestDTO,
-	FavoritePagesService
-} from '../../favorite-pages.service';
-
-interface ModalData {
-	mode: 'add' | 'edit';
-	url?: string; // For add mode
-	favorite?: FavoritePageResponseDTO; // For edit mode
-}
-
-@Component({
-	standalone: true,
-	imports: [
-		CommonModule,
-		ReactiveFormsModule,
-		FormsModule,
-		ARiLFormModule,
-		FieldComponent,
-		TextComponent,
-		ButtonComponent,
-		TranslocoModule
-	],
-	templateUrl: './add-edit-favorite-modal.component.html'
-})
-export class AddEditFavoriteModalComponent implements OnInit {
-	favoriteForm!: FormGroup;
-	modalData: ModalData;
-
-	private subjects = {
-		saveFavorite: new Subject<FavoritePageSaveRequestDTO>(),
-		updateFavorite: new Subject<FavoritePageUpdateRequestDTO>()
-	};
-
-	saveFavoriteService = toSignal(
-		this.subjects.saveFavorite.pipe(switchMap((data) => this.favoritePagesService.saveFavoritePage(data)))
-	);
-
-	updateFavoriteService = toSignal(
-		this.subjects.updateFavorite.pipe(
-			switchMap((data) => this.favoritePagesService.updateFavoritePage(this.modalData.favorite?.id as number, data))
-		)
-	);
-
-	constructor(
-		private readonly formBuilder: FormBuilder,
-		private readonly dialogRef: DynamicDialogRef,
-		private readonly dialogConfig: DynamicDialogConfig,
-		private readonly favoritePagesService: FavoritePagesService,
-		private readonly messageService: MessageService,
-		private readonly translocoService: TranslocoService
-	) {
-		this.modalData = this.dialogConfig.data;
-		this.initializeEffects();
-		this.initializeForm();
-	}
-
-	ngOnInit(): void {
-		if (!this.modalData || !['add', 'edit'].includes(this.modalData.mode)) {
-			this.dialogRef.close('error');
-		}
-	}
-
-	private initializeEffects(): void {
-		// Save favorite effect
-		effect(
-			() => {
-				const service = this.saveFavoriteService();
-				if (service?.response) {
-					this.messageService.add({
-						severity: 'success',
-						summary: this.translocoService.translate('favoritePages.success'),
-						detail: this.translocoService.translate('favoritePages.saveSuccessfully'),
-						key: 'toast-root'
-					});
-					this.dialogRef.close({ status: 'success', data: service.response });
-				}
-			},
-			{ allowSignalWrites: true }
-		);
-
-		// Update favorite effect
-		effect(
-			() => {
-				const service = this.updateFavoriteService();
-				if (service?.response) {
-					this.messageService.add({
-						severity: 'success',
-						summary: this.translocoService.translate('favoritePages.success'),
-						detail: this.translocoService.translate('favoritePages.updatedSuccessfully'),
-						key: 'toast-root'
-					});
-					this.dialogRef.close({ status: 'success', data: service.response });
-				}
-			},
-			{ allowSignalWrites: true }
-		);
-	}
-
-	private initializeForm(): void {
-		if (this.modalData.mode === 'add') {
-			this.favoriteForm = this.formBuilder.group({
-				label: ['', [Validators.required, Validators.minLength(1), Validators.maxLength(100)]],
-				url: [{ value: this.modalData.url || '', disabled: true }]
-			});
-		} else if (this.modalData.mode === 'edit' && this.modalData.favorite) {
-			this.favoriteForm = this.formBuilder.group({
-				label: [
-					this.modalData.favorite.label,
-					[Validators.required, Validators.minLength(1), Validators.maxLength(100)]
-				],
-				url: [{ value: this.modalData.favorite.url, disabled: true }]
-			});
-		}
-	}
-
-	get isAddMode(): boolean {
-		return this.modalData.mode === 'add';
-	}
-
-	get isEditMode(): boolean {
-		return this.modalData.mode === 'edit';
-	}
-
-	submit(): void {
-		const formValue = this.favoriteForm.value;
-
-		if (this.isAddMode) {
-			const saveRequest: FavoritePageSaveRequestDTO = {
-				url: this.modalData.url!,
-				label: formValue.label.trim()
-			};
-			this.subjects.saveFavorite.next(saveRequest);
-		} else if (this.isEditMode && this.modalData.favorite) {
-			const updateRequest: any = {
-				label: formValue.label.trim(),
-				url: this.modalData.url!,
-				version: this.modalData.favorite.version
-			};
-			this.subjects.updateFavorite.next(updateRequest);
-		}
-	}
-
-	cancel(): void {
-		this.dialogRef.close('cancel');
-	}
-}
+import { CommonModule } from '@angular/common';
+import { Component, OnInit, effect } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
+import { FormBuilder, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
+
+import { MessageService } from 'primeng/api';
+import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
+
+import { TranslocoModule, TranslocoService } from '@ngneat/transloco';
+import { Subject, switchMap } from 'rxjs';
+
+import { ButtonComponent } from 'aril/ui/button';
+import { FieldComponent } from 'aril/ui/field';
+import { ARiLFormModule } from 'aril/ui/form';
+import { TextComponent } from 'aril/ui/text';
+
+import {
+	FavoritePageResponseDTO,
+	FavoritePageSaveRequestDTO,
+	FavoritePageUpdateRequestDTO,
+	FavoritePagesService
+} from '../../favorite-pages.service';
+
+interface ModalData {
+	mode: 'add' | 'edit';
+	url?: string; // For add mode
+	favorite?: FavoritePageResponseDTO; // For edit mode
+}
+
+@Component({
+	standalone: true,
+	imports: [
+		CommonModule,
+		ReactiveFormsModule,
+		FormsModule,
+		ARiLFormModule,
+		FieldComponent,
+		TextComponent,
+		ButtonComponent,
+		TranslocoModule
+	],
+	templateUrl: './add-edit-favorite-modal.component.html'
+})
+export class AddEditFavoriteModalComponent implements OnInit {
+	favoriteForm!: FormGroup;
+	modalData: ModalData;
+
+	private subjects = {
+		saveFavorite: new Subject<FavoritePageSaveRequestDTO>(),
+		updateFavorite: new Subject<FavoritePageUpdateRequestDTO>()
+	};
+
+	saveFavoriteService = toSignal(
+		this.subjects.saveFavorite.pipe(switchMap((data) => this.favoritePagesService.saveFavoritePage(data)))
+	);
+
+	updateFavoriteService = toSignal(
+		this.subjects.updateFavorite.pipe(
+			switchMap((data) => this.favoritePagesService.updateFavoritePage(this.modalData.favorite?.id as number, data))
+		)
+	);
+
+	constructor(
+		private readonly formBuilder: FormBuilder,
+		private readonly dialogRef: DynamicDialogRef,
+		private readonly dialogConfig: DynamicDialogConfig,
+		private readonly favoritePagesService: FavoritePagesService,
+		private readonly messageService: MessageService,
+		private readonly translocoService: TranslocoService
+	) {
+		this.modalData = this.dialogConfig.data;
+		this.initializeEffects();
+		this.initializeForm();
+	}
+
+	ngOnInit(): void {
+		if (!this.modalData || !['add', 'edit'].includes(this.modalData.mode)) {
+			this.dialogRef.close('error');
+		}
+	}
+
+	private initializeEffects(): void {
+		// Save favorite effect
+		effect(
+			() => {
+				const service = this.saveFavoriteService();
+				if (service?.response) {
+					this.messageService.add({
+						severity: 'success',
+						summary: this.translocoService.translate('favoritePages.success'),
+						detail: this.translocoService.translate('favoritePages.saveSuccessfully'),
+						key: 'toast-root'
+					});
+					this.dialogRef.close({ status: 'success', data: service.response });
+				}
+			},
+			{ allowSignalWrites: true }
+		);
+
+		// Update favorite effect
+		effect(
+			() => {
+				const service = this.updateFavoriteService();
+				if (service?.response) {
+					this.messageService.add({
+						severity: 'success',
+						summary: this.translocoService.translate('favoritePages.success'),
+						detail: this.translocoService.translate('favoritePages.updatedSuccessfully'),
+						key: 'toast-root'
+					});
+					this.dialogRef.close({ status: 'success', data: service.response });
+				}
+			},
+			{ allowSignalWrites: true }
+		);
+	}
+
+	private initializeForm(): void {
+		if (this.modalData.mode === 'add') {
+			this.favoriteForm = this.formBuilder.group({
+				label: ['', [Validators.required, Validators.minLength(1), Validators.maxLength(100)]],
+				url: [{ value: this.modalData.url || '', disabled: true }]
+			});
+		} else if (this.modalData.mode === 'edit' && this.modalData.favorite) {
+			this.favoriteForm = this.formBuilder.group({
+				label: [
+					this.modalData.favorite.label,
+					[Validators.required, Validators.minLength(1), Validators.maxLength(100)]
+				],
+				url: [{ value: this.modalData.favorite.url, disabled: true }]
+			});
+		}
+	}
+
+	get isAddMode(): boolean {
+		return this.modalData.mode === 'add';
+	}
+
+	get isEditMode(): boolean {
+		return this.modalData.mode === 'edit';
+	}
+
+	submit(): void {
+		const formValue = this.favoriteForm.value;
+
+		if (this.isAddMode) {
+			const saveRequest: FavoritePageSaveRequestDTO = {
+				url: this.modalData.url!,
+				label: formValue.label.trim()
+			};
+			this.subjects.saveFavorite.next(saveRequest);
+		} else if (this.isEditMode && this.modalData.favorite) {
+			const updateRequest: any = {
+				label: formValue.label.trim(),
+				url: this.modalData.url!,
+				version: this.modalData.favorite.version
+			};
+			this.subjects.updateFavorite.next(updateRequest);
+		}
+	}
+
+	cancel(): void {
+		this.dialogRef.close('cancel');
+	}
+}