diff --git a/src/app/authenticate/login/login.component.html b/src/app/authenticate/login/login.component.html index 014de12..bb04f41 100644 --- a/src/app/authenticate/login/login.component.html +++ b/src/app/authenticate/login/login.component.html @@ -23,10 +23,9 @@
Logo
-

+
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 39444de..7d9afac 100644 --- a/src/app/user-management/setup-user/setup-user.component.ts +++ b/src/app/user-management/setup-user/setup-user.component.ts @@ -192,6 +192,7 @@ ngOnInit(): void { userRole: response.role, defaultPassword: '' }); + this.userForm.disable(); this.selectedUserId = userId; this.isLoading = false; }, diff --git a/src/app/user-permissions/user-permissions.component.html b/src/app/user-permissions/user-permissions.component.html index 79f11b4..cb1f543 100644 --- a/src/app/user-permissions/user-permissions.component.html +++ b/src/app/user-permissions/user-permissions.component.html @@ -20,7 +20,7 @@ placeholder="{{ 'choose' | translate }}" (change)="onUserChange()" [searchable]="true" - [clearable]="true" + [clearable]="false" [dropdownPosition]="'auto'" [virtualScroll]="true" [bufferAmount]="10"> diff --git a/src/app/user-permissions/user-permissions.component.ts b/src/app/user-permissions/user-permissions.component.ts index 8af7d0a..526be72 100644 --- a/src/app/user-permissions/user-permissions.component.ts +++ b/src/app/user-permissions/user-permissions.component.ts @@ -151,7 +151,7 @@ export class UserPermissionsComponent { } this.httpService.requestPUT(URIKey.USER_SAVE_PERMISSION, payload).subscribe((response: any) => { if (!(response instanceof HttpErrorResponse)) { - this.i18nService.success(SuccessMessages.SAVED_SUCESSFULLY, []); + this.i18nService.success(SuccessMessages.SAVED_SUCCESSFULLY, []); this.permission.reset(); this.permission.get('userCode')?.setValue(""); this.showPermissions = false; diff --git a/src/app/utils/enums.ts b/src/app/utils/enums.ts index b4898ac..69c3d07 100644 --- a/src/app/utils/enums.ts +++ b/src/app/utils/enums.ts @@ -50,8 +50,6 @@ export enum HiddenValues { } export enum SuccessMessages { - -SAVED_SUCESSFULLY = "SUC_APP_F_0001", LOGIN_SUCCESSFULLY = "LOGIN_SUCCESSFULLY", RESET_PASSWORD_SUCCESS ="RESET_PASSWORD_SUCCESS", CHANGE_PASSWORD_SUCCESS ="CHANGE_PASSWORD_SUCCESS", @@ -62,7 +60,6 @@ ACCOUNT_CLOSED_SUCCESSFULLY = "ACCOUNT_CLOSED_SUCCESSFULLY", 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 1f67ef6..e43afc4 100644 --- a/src/assets/i18n/Arabic.json +++ b/src/assets/i18n/Arabic.json @@ -265,6 +265,7 @@ "nameMinLength": "يجب أن يكون الاسم مكوّنًا من 5 أحرف على الأقل", "emptySpaceRestriction": "المسافات الفارغة غير مسموح بها", "USER_CREATED_SUCCESS": "تم إنشاء المستخدم", - "USER_DELETE_SUCCESS": "تم حذف المستخدم" + "USER_DELETE_SUCCESS": "تم حذف المستخدم", + "SAVED_SUCCESSFULLY": "تم الحفظ بنجاح" } \ No newline at end of file diff --git a/src/assets/i18n/English.json b/src/assets/i18n/English.json index bba8605..e1f276b 100644 --- a/src/assets/i18n/English.json +++ b/src/assets/i18n/English.json @@ -268,5 +268,6 @@ "emptySpaceRestriction" : "Empty spaces are not allowed", "USER_CREATED_SUCCESS": "User Created", "USER_DELETE_SUCCESS": "User Deleted", + "SAVED_SUCCESSFULLY" :"Saved Successfully", "oldAndNewPass":"Old password and new password cannot be the same" } \ No newline at end of file