@@ -204,6 +250,7 @@
| {{ item.userId }} |
{{ item.userFullname }} |
+ {{item.role}} |
diff --git a/src/app/user-management/setup-user/setup-user.component.ts b/src/app/user-management/setup-user/setup-user.component.ts
index 48202df..28bf7fd 100644
--- a/src/app/user-management/setup-user/setup-user.component.ts
+++ b/src/app/user-management/setup-user/setup-user.component.ts
@@ -10,8 +10,10 @@ import { ButtonManagementService } from '../../services/button-management.servic
import { StorageService } from '../../shared/services/storage.service';
import { TableFilterPipe } from '../../shared/pipes/table-filter.pipe';
import { URIKey } from '../../utils/uri-enums';
-import { HttpParams } from '@angular/common/http';
+import { HttpErrorResponse, HttpParams } from '@angular/common/http';
import { HttpURIService } from '../../app.http.uri.service';
+import { I18NService } from '../../services/i18n.service';
+import { SuccessMessages } from '../../utils/enums';
@@ -52,7 +54,8 @@ export class SetupUserComponent implements OnInit {
private fb: FormBuilder,
private buttonManagementService: ButtonManagementService,
private storageService: StorageService,
- private httpService: HttpURIService
+ private httpService: HttpURIService,
+ private i18nService: I18NService
){}
onSearch(value: string): void {
@@ -95,13 +98,14 @@ export class SetupUserComponent implements OnInit {
}
this.httpService.requestPOST(URIKey.CREATE_USER, newUser).subscribe({
- next: () => {
- this.userForm.reset();
- this.mode = 'edit';
- this.loadUsersDirect()
- },
-
- error: (err: any) => console.error(err)
+ next: (response) => {
+ if (!(response instanceof HttpErrorResponse)) {
+ this.i18nService.success(SuccessMessages.USER_CREATED_SUCCESS, []);
+ this.userForm.reset();
+ this.mode = 'edit';
+ this.loadUsersDirect()
+ }
+ }
});
@@ -126,9 +130,25 @@ ngOnInit(): void {
this.getButtonPermissions();
this.userForm = this.fb.group({
- userId: ['', [Validators.required]],
- userFullname: ['', [Validators.required, Validators.maxLength(500)]],
- defaultPassword: ['', Validators.required],
+ userId: ['', [
+ Validators.required,
+ Validators.minLength(5),
+ Validators.pattern(/^\S+$/)
+ ]
+ ],
+ userFullname: ['', [
+ Validators.required,
+ Validators.minLength(5),
+ Validators.pattern(/^\S+$/)
+ ]
+ ],
+ defaultPassword: ['', [
+ Validators.required,
+ Validators.pattern(
+ /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,20}$/
+ )
+ ]
+ ],
email: ['', [Validators.required, Validators.email]],
userRole: [null, Validators.required]
});
@@ -182,14 +202,13 @@ ngOnInit(): void {
let params = new HttpParams().set('userId', userId);
this.httpService.requestDELETE(URIKey.DELETE_USER, params).subscribe({
next: (response) =>{
+ if (!(response instanceof HttpErrorResponse)) {
+ this.i18nService.success(SuccessMessages.USER_DELETE_SUCCESS, []);
this.loadUsersDirect();
- this.userForm.reset()
+ this.userForm.reset();
this.selectedUserId = null;
- },
- error: (err) =>{
- console.error('Error fetching users:', err);
- this.allItems = [];
- this.isLoading = false;
+ }
+
}
})
}
diff --git a/src/app/utils/enums.ts b/src/app/utils/enums.ts
index 9cc8c4d..b4898ac 100644
--- a/src/app/utils/enums.ts
+++ b/src/app/utils/enums.ts
@@ -59,7 +59,10 @@ TRANSACTION_SUCCESSFUL = "TRANSACTION_SUCCESSFUL",
SAVED_SUCCESSFULLY = "SAVED_SUCCESSFULLY",
RECORD_DELETED_SUCCESSFULY = "RECORD_DELETED_SUCCESSFULY",
ACCOUNT_CLOSED_SUCCESSFULLY = "ACCOUNT_CLOSED_SUCCESSFULLY",
-SUCCESS_MESSAGE = "SUCCESS_MESSAGE"
+SUCCESS_MESSAGE = "SUCCESS_MESSAGE",
+USER_CREATED_SUCCESS = "USER_CREATED_SUCCESS",
+USER_DELETE_SUCCESS = "USER_DELETE_SUCCESS"
+
}
export enum MESSAGEKEY {
diff --git a/src/assets/i18n/Arabic.json b/src/assets/i18n/Arabic.json
index a9689a9..1f67ef6 100644
--- a/src/assets/i18n/Arabic.json
+++ b/src/assets/i18n/Arabic.json
@@ -260,5 +260,11 @@
"ERR_SEC_0005": "المستخدم غير موجود",
"ERR_SEC_0006": "كلمة المرور التي تم إدخالها غير صحيحة",
"toDateGreaterThanToday": "يجب أن يكون التاريخ الحالي أقل من التاريخ الحالي",
- "fromDateGreaterThanToday": "يجب أن يكون تاريخ البدء أقل من التاريخ الحالي"
+ "fromDateGreaterThanToday": "يجب أن يكون تاريخ البدء أقل من التاريخ الحالي",
+ "userIdMinLength": "يجب أن يكون معرف المستخدم مكوّنًا من 5 أحرف على الأقل",
+ "nameMinLength": "يجب أن يكون الاسم مكوّنًا من 5 أحرف على الأقل",
+ "emptySpaceRestriction": "المسافات الفارغة غير مسموح بها",
+ "USER_CREATED_SUCCESS": "تم إنشاء المستخدم",
+ "USER_DELETE_SUCCESS": "تم حذف المستخدم"
+
}
\ No newline at end of file
diff --git a/src/assets/i18n/English.json b/src/assets/i18n/English.json
index 35076b6..c30915b 100644
--- a/src/assets/i18n/English.json
+++ b/src/assets/i18n/English.json
@@ -112,7 +112,7 @@
"oldPassword":"Old Password",
"newPasswordStatic":"New Password",
"savePassword":"Save",
- "passwordPattern":"Password must be over 8 characters and include an uppercase letter, a lower case letter, a number and a special character",
+ "passwordPattern":"Password must be 8–20 characters and include uppercase, lowercase, number, and special character",
"SMSGatewaySelect":"Select Gateway",
"selectIdentValueType": "Select Type",
"IdTypeSelect":"Select Select Type",
@@ -260,5 +260,10 @@
"ERR_SEC_0005": "User not found",
"ERR_SEC_0006": "Incorrect password",
"toDateGreaterThanToday": "To Date must be less than Current Date",
- "fromDateGreaterThanToday": "From Date must be less than Current Date"
+ "fromDateGreaterThanToday": "From Date must be less than Current Date",
+ "userIdMinLength" : "User ID must be at least 5 characters",
+ "nameMinLength" : "Name must be at least 5 characters",
+ "emptySpaceRestriction" : "Empty spaces are not allowed",
+ "USER_CREATED_SUCCESS": "User Created",
+ "USER_DELETE_SUCCESS": "User Deleted"
}
\ No newline at end of file
|