Merge branch 'dev-pending-20-01-2026' of https://ct.mfsys.com.pk/aConnect/aConnect-UX into dev-pending-20-01-2026

src/app/authenticate/login/login.component.html

@@ -23,10 +23,9 @@
             <div class="bg-primary bg-soft text-center py-3 mt-2">
               <img src="assets/images/logo.png" class="img-fluid mb-2" height="120" width="150" alt="Logo">
             </div>
-            <h2 class="text-center fw-semibold my-3">
+            <!-- <h2 class="text-center fw-semibold my-3">
               aConnect
-            </h2>
-
+            </h2> -->
             <div class="card-body">
               <form [formGroup]="loginForm" class="form-horizontal">
                 <div class="mb-3">

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;
       },

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">

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;

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 {

src/assets/i18n/Arabic.json

@@ -265,6 +265,7 @@
     "nameMinLength": "يجب أن يكون الاسم مكوّنًا من 5 أحرف على الأقل",
     "emptySpaceRestriction": "المسافات الفارغة غير مسموح بها",
     "USER_CREATED_SUCCESS": "تم إنشاء المستخدم",
-    "USER_DELETE_SUCCESS": "تم حذف المستخدم"
+    "USER_DELETE_SUCCESS": "تم حذف المستخدم",
+    "SAVED_SUCCESSFULLY": "تم الحفظ بنجاح"
 
 }

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"
 }