aril 1.1.64 → 1.1.65

package/theme/layout/app/profileSidebar/modals/change-password-modal/change-password-modal.component.ts

@@ -1,178 +1,178 @@
-import { CommonModule } from '@angular/common';
-import { Component, effect } from '@angular/core';
-import { toSignal } from '@angular/core/rxjs-interop';
-import {
-	AbstractControl,
-	FormBuilder,
-	FormControl,
-	FormGroup,
-	FormsModule,
-	ReactiveFormsModule,
-	ValidationErrors
-} from '@angular/forms';
-
-import { MessageService } from 'primeng/api';
-import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
-import { PasswordModule } from 'primeng/password';
-import { TooltipModule } from 'primeng/tooltip';
-
-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 { ProfileService, ResetPasswordRequestDTO } from '../../profile.service';
-
-export class PasswordValidators {
-	static passwordMatchValidator = (passwordFormGroup: FormGroup) => {
-		return (control: AbstractControl): ValidationErrors | null => {
-			if (!control.value || !passwordFormGroup) {
-				return null;
-			}
-
-			const passwordControl = passwordFormGroup.get('newPassword');
-			const confirmPasswordValue = control.value;
-
-			if (!passwordControl || !confirmPasswordValue) {
-				return null;
-			}
-
-			const passwordsMatch = passwordControl.value === confirmPasswordValue;
-			return passwordsMatch ? null : (
-					{
-						passwordMismatch: 'Şifreler eşleşmiyor. Lütfen aynı şifreyi giriniz.'
-					}
-				);
-		};
-	};
-
-	static minLength(length: number) {
-		return (control: AbstractControl): ValidationErrors | null => {
-			if (!control.value || control.value.length >= length) {
-				return null;
-			}
-			return { minlength: `Şifre en az ${length} karakter olmalıdır.` };
-		};
-	}
-
-	static required(control: AbstractControl): ValidationErrors | null {
-		if (!control.value || control.value.trim() === '') {
-			return { required: 'Bu alan zorunludur.' };
-		}
-		return null;
-	}
-}
-
-@Component({
-	standalone: true,
-	imports: [
-		CommonModule,
-		ReactiveFormsModule,
-		FormsModule,
-		ARiLFormModule,
-		FieldComponent,
-		ButtonComponent,
-		PasswordModule,
-		TooltipModule,
-		TranslocoModule
-	],
-	templateUrl: './change-password-modal.component.html',
-	styleUrls: ['./change-password-modal.component.scss']
-})
-export class ChangePasswordModalComponent {
-	passwordForm!: FormGroup;
-	userId: string;
-
-	private subjects = {
-		resetPassword: new Subject<ResetPasswordRequestDTO>()
-	};
-
-	resetPasswordService = toSignal(
-		this.subjects.resetPassword.pipe(switchMap((data) => this.profileService.resetPassword(data)))
-	);
-
-	constructor(
-		private readonly formBuilder: FormBuilder,
-		private readonly dialogRef: DynamicDialogRef,
-		private readonly dialogConfig: DynamicDialogConfig,
-		private readonly profileService: ProfileService,
-		private readonly translocoService: TranslocoService,
-		private readonly messageService: MessageService
-	) {
-		this.userId = this.dialogConfig.data?.userId;
-
-		effect(
-			() => {
-				const service = this.resetPasswordService();
-				if (service?.response) {
-					this.messageService.add({
-						severity: 'success',
-						summary: this.translocoService.translate('profileSidebar.changePasswordSuccess'),
-						detail: this.translocoService.translate('profileSidebar.changePasswordSuccessDetail'),
-						key: 'toast-root'
-					});
-					this.dialogRef.close({ status: 'success' });
-				}
-			},
-			{ allowSignalWrites: true }
-		);
-
-		this.initializeForm();
-
-		if (!this.userId) {
-			this.dialogRef.close('error');
-		}
-	}
-
-	initializeForm(): void {
-		this.passwordForm = this.formBuilder.group({
-			newPassword: new FormControl('', [PasswordValidators.required, PasswordValidators.minLength(6)]),
-			confirmPassword: new FormControl('', [PasswordValidators.required])
-		});
-
-		const confirmPasswordControl = this.passwordForm.get('confirmPassword');
-		if (confirmPasswordControl) {
-			confirmPasswordControl.setValidators([
-				PasswordValidators.required,
-				PasswordValidators.passwordMatchValidator(this.passwordForm)
-			]);
-		}
-
-		this.passwordForm.get('newPassword')?.valueChanges.subscribe(() => {
-			confirmPasswordControl?.updateValueAndValidity({ emitEvent: false });
-		});
-	}
-
-	getErrorMessage(controlName: string): string {
-		const control = this.passwordForm.get(controlName);
-		if (control?.errors) {
-			const errors = control.errors;
-			const errorKeys = Object.keys(errors);
-			if (errorKeys.length > 0) {
-				return errors[errorKeys[0]];
-			}
-		}
-		return '';
-	}
-
-	submit(): void {
-		if (this.passwordForm.invalid) {
-			this.passwordForm.markAllAsTouched();
-			return;
-		}
-
-		const formValue = this.passwordForm.value;
-		const resetRequest: ResetPasswordRequestDTO = {
-			userId: this.userId,
-			password: formValue.newPassword
-		};
-
-		this.subjects.resetPassword.next(resetRequest);
-	}
-
-	cancel(): void {
-		this.dialogRef.close('cancel');
-	}
-}
+import { CommonModule } from '@angular/common';
+import { Component, effect } from '@angular/core';
+import { toSignal } from '@angular/core/rxjs-interop';
+import {
+	AbstractControl,
+	FormBuilder,
+	FormControl,
+	FormGroup,
+	FormsModule,
+	ReactiveFormsModule,
+	ValidationErrors
+} from '@angular/forms';
+
+import { MessageService } from 'primeng/api';
+import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
+import { PasswordModule } from 'primeng/password';
+import { TooltipModule } from 'primeng/tooltip';
+
+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 { ProfileService, ResetPasswordRequestDTO } from '../../profile.service';
+
+export class PasswordValidators {
+	static passwordMatchValidator = (passwordFormGroup: FormGroup) => {
+		return (control: AbstractControl): ValidationErrors | null => {
+			if (!control.value || !passwordFormGroup) {
+				return null;
+			}
+
+			const passwordControl = passwordFormGroup.get('newPassword');
+			const confirmPasswordValue = control.value;
+
+			if (!passwordControl || !confirmPasswordValue) {
+				return null;
+			}
+
+			const passwordsMatch = passwordControl.value === confirmPasswordValue;
+			return passwordsMatch ? null : (
+					{
+						passwordMismatch: 'Şifreler eşleşmiyor. Lütfen aynı şifreyi giriniz.'
+					}
+				);
+		};
+	};
+
+	static minLength(length: number) {
+		return (control: AbstractControl): ValidationErrors | null => {
+			if (!control.value || control.value.length >= length) {
+				return null;
+			}
+			return { minlength: `Şifre en az ${length} karakter olmalıdır.` };
+		};
+	}
+
+	static required(control: AbstractControl): ValidationErrors | null {
+		if (!control.value || control.value.trim() === '') {
+			return { required: 'Bu alan zorunludur.' };
+		}
+		return null;
+	}
+}
+
+@Component({
+	standalone: true,
+	imports: [
+		CommonModule,
+		ReactiveFormsModule,
+		FormsModule,
+		ARiLFormModule,
+		FieldComponent,
+		ButtonComponent,
+		PasswordModule,
+		TooltipModule,
+		TranslocoModule
+	],
+	templateUrl: './change-password-modal.component.html',
+	styleUrls: ['./change-password-modal.component.scss']
+})
+export class ChangePasswordModalComponent {
+	passwordForm!: FormGroup;
+	userId: string;
+
+	private subjects = {
+		resetPassword: new Subject<ResetPasswordRequestDTO>()
+	};
+
+	resetPasswordService = toSignal(
+		this.subjects.resetPassword.pipe(switchMap((data) => this.profileService.resetPassword(data)))
+	);
+
+	constructor(
+		private readonly formBuilder: FormBuilder,
+		private readonly dialogRef: DynamicDialogRef,
+		private readonly dialogConfig: DynamicDialogConfig,
+		private readonly profileService: ProfileService,
+		private readonly translocoService: TranslocoService,
+		private readonly messageService: MessageService
+	) {
+		this.userId = this.dialogConfig.data?.userId;
+
+		effect(
+			() => {
+				const service = this.resetPasswordService();
+				if (service?.response) {
+					this.messageService.add({
+						severity: 'success',
+						summary: this.translocoService.translate('profileSidebar.changePasswordSuccess'),
+						detail: this.translocoService.translate('profileSidebar.changePasswordSuccessDetail'),
+						key: 'toast-root'
+					});
+					this.dialogRef.close({ status: 'success' });
+				}
+			},
+			{ allowSignalWrites: true }
+		);
+
+		this.initializeForm();
+
+		if (!this.userId) {
+			this.dialogRef.close('error');
+		}
+	}
+
+	initializeForm(): void {
+		this.passwordForm = this.formBuilder.group({
+			newPassword: new FormControl('', [PasswordValidators.required, PasswordValidators.minLength(6)]),
+			confirmPassword: new FormControl('', [PasswordValidators.required])
+		});
+
+		const confirmPasswordControl = this.passwordForm.get('confirmPassword');
+		if (confirmPasswordControl) {
+			confirmPasswordControl.setValidators([
+				PasswordValidators.required,
+				PasswordValidators.passwordMatchValidator(this.passwordForm)
+			]);
+		}
+
+		this.passwordForm.get('newPassword')?.valueChanges.subscribe(() => {
+			confirmPasswordControl?.updateValueAndValidity({ emitEvent: false });
+		});
+	}
+
+	getErrorMessage(controlName: string): string {
+		const control = this.passwordForm.get(controlName);
+		if (control?.errors) {
+			const errors = control.errors;
+			const errorKeys = Object.keys(errors);
+			if (errorKeys.length > 0) {
+				return errors[errorKeys[0]];
+			}
+		}
+		return '';
+	}
+
+	submit(): void {
+		if (this.passwordForm.invalid) {
+			this.passwordForm.markAllAsTouched();
+			return;
+		}
+
+		const formValue = this.passwordForm.value;
+		const resetRequest: ResetPasswordRequestDTO = {
+			userId: this.userId,
+			password: formValue.newPassword
+		};
+
+		this.subjects.resetPassword.next(resetRequest);
+	}
+
+	cancel(): void {
+		this.dialogRef.close('cancel');
+	}
+}

package/theme/layout/app/profileSidebar/modals/edit-profile-modal/edit-profile-modal.component.html

@@ -1,71 +1,71 @@
-<div *transloco="let t; read: 'profileSidebar'">
-	<aril-form [formGroup]="profileForm">
-		<aril-field [label]="t('userStatus')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
-			<aril-checkbox [label]="' '" formControlName="enabled" [disabled]="true"></aril-checkbox>
-		</aril-field>
-
-		<aril-field [label]="t('systemUser')" [cols]="{ xl: 6, lg: 6, md: 12, sm: 12 }">
-			<aril-checkbox [label]="' '" formControlName="systemUser" [disabled]="true"></aril-checkbox>
-		</aril-field>
-
-		<aril-field [label]="t('userType')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
-			<aril-select-box formControlName="userTypeId" [items]="userTypeItems" itemKey="value" itemText="label" [placeholder]="t('select')"></aril-select-box>
-		</aril-field>
-
-		<aril-field [label]="t('systemUserApp')" [cols]="{ xl: 6, lg: 6, md: 12, sm: 12 }">
-			<aril-select-box formControlName="clientOfSystemUser" [items]="clientList" itemText="text" itemKey="key" [placeholder]="t('select')"></aril-select-box>
-		</aril-field>
-
-		<aril-field [label]="t('username')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
-			<aril-text formControlName="userName" [disabled]="true"></aril-text>
-		</aril-field>
-
-		<aril-field [label]="t('userPassword')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
-			<aril-password formControlName="password" [placeholder]="'&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;'"></aril-password>
-		</aril-field>
-
-		<aril-field [label]="t('firstName')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
-			<aril-text formControlName="firstName"></aril-text>
-		</aril-field>
-
-		<aril-field [label]="t('lastName')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
-			<aril-text formControlName="lastName"></aril-text>
-		</aril-field>
-
-		<aril-field [label]="t('email')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
-			<aril-text formControlName="email"></aril-text>
-		</aril-field>
-
-		<aril-field [label]="t('phone')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
-			<aril-mask mask="(999) 999 99 99" [placeholder]="t('phoneExample')" formControlName="phone"></aril-mask>
-		</aril-field>
-
-		<aril-field [label]="t('tcNumber')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
-			<aril-mask mask="99999999999" formControlName="tckn"></aril-mask>
-		</aril-field>
-
-		<aril-field [label]="t('responsibleRegions')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
-			<aril-treeSelect
-				[options]="treeItems"
-				formControlName="regions"
-				[placeholder]="t('select')"
-				(nodeSelect)="nodeSelect($event)"
-				(nodeUnselect)="nodeUnselect($event)"
-				(cleared)="clear()">
-			</aril-treeSelect>
-		</aril-field>
-
-		<aril-field [label]="t('notes')" [cols]="{ xl: 12, lg: 12, md: 12, sm: 12 }">
-			<aril-text-area [rows]="3" [cols]="40" formControlName="notes"></aril-text-area>
-		</aril-field>
-
-		<aril-field [label]="t('photoUrl')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
-			<aril-text formControlName="photoUrl"></aril-text>
-		</aril-field>
-
-		<div class="col-12 flex justify-content-end mt-3 gap-1">
-			<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]="profileForm" (validEvent)="submit()"></aril-form-submit>
-		</div>
-	</aril-form>
-</div>
+<div *transloco="let t; read: 'profileSidebar'">
+	<aril-form [formGroup]="profileForm">
+		<aril-field [label]="t('userStatus')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
+			<aril-checkbox [label]="' '" formControlName="enabled" [disabled]="true"></aril-checkbox>
+		</aril-field>
+
+		<aril-field [label]="t('systemUser')" [cols]="{ xl: 6, lg: 6, md: 12, sm: 12 }">
+			<aril-checkbox [label]="' '" formControlName="systemUser" [disabled]="true"></aril-checkbox>
+		</aril-field>
+
+		<aril-field [label]="t('userType')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
+			<aril-select-box formControlName="userTypeId" [items]="userTypeItems" itemKey="value" itemText="label" [placeholder]="t('select')"></aril-select-box>
+		</aril-field>
+
+		<aril-field [label]="t('systemUserApp')" [cols]="{ xl: 6, lg: 6, md: 12, sm: 12 }">
+			<aril-select-box formControlName="clientOfSystemUser" [items]="clientList" itemText="text" itemKey="key" [placeholder]="t('select')"></aril-select-box>
+		</aril-field>
+
+		<aril-field [label]="t('username')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
+			<aril-text formControlName="userName" [disabled]="true"></aril-text>
+		</aril-field>
+
+		<aril-field [label]="t('userPassword')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
+			<aril-password formControlName="password" [placeholder]="'&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;&#8728;'"></aril-password>
+		</aril-field>
+
+		<aril-field [label]="t('firstName')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
+			<aril-text formControlName="firstName"></aril-text>
+		</aril-field>
+
+		<aril-field [label]="t('lastName')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
+			<aril-text formControlName="lastName"></aril-text>
+		</aril-field>
+
+		<aril-field [label]="t('email')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
+			<aril-text formControlName="email"></aril-text>
+		</aril-field>
+
+		<aril-field [label]="t('phone')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
+			<aril-mask mask="(999) 999 99 99" [placeholder]="t('phoneExample')" formControlName="phone"></aril-mask>
+		</aril-field>
+
+		<aril-field [label]="t('tcNumber')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }" [markAsRequired]="true">
+			<aril-mask mask="99999999999" formControlName="tckn"></aril-mask>
+		</aril-field>
+
+		<aril-field [label]="t('responsibleRegions')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
+			<aril-treeSelect
+				[options]="treeItems"
+				formControlName="regions"
+				[placeholder]="t('select')"
+				(nodeSelect)="nodeSelect($event)"
+				(nodeUnselect)="nodeUnselect($event)"
+				(cleared)="clear()">
+			</aril-treeSelect>
+		</aril-field>
+
+		<aril-field [label]="t('notes')" [cols]="{ xl: 12, lg: 12, md: 12, sm: 12 }">
+			<aril-text-area [rows]="3" [cols]="40" formControlName="notes"></aril-text-area>
+		</aril-field>
+
+		<aril-field [label]="t('photoUrl')" [cols]="{ xl: 6, lg: 6, md: 6, sm: 12 }">
+			<aril-text formControlName="photoUrl"></aril-text>
+		</aril-field>
+
+		<div class="col-12 flex justify-content-end mt-3 gap-1">
+			<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]="profileForm" (validEvent)="submit()"></aril-form-submit>
+		</div>
+	</aril-form>
+</div>