mgr/dashboard: Not able to edit user display/full name in user form

Fixes: https://tracker.ceph.com/issues/70554
Signed-off-by: Naman Munet <naman.munet@ibm.com>

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/rgw/users.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/rgw/users.po.ts
index 6a931faf17bd9e6a8dc0192bd885bf89f122a7ee..5b3be4c41016b6eb2d75f307c5f23eb9e8edd9d1 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/rgw/users.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/rgw/users.po.ts
@@ -37,7 +37,7 @@ export class UsersPageHelper extends PageHelper {
     this.navigateEdit(name, false, true, null);
 
     // Change the full name field
-    cy.get('input#display_name').click().clear({ force: true }).type(new_fullname, { force: true });
+    cy.get('input#display_name').click().clear().type(new_fullname);
 
     // Change the email field
     cy.get('#email').click().clear().type(new_email);

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
index f63f028c5c65a86171627418032b34f88ee3594f..8863576311750b35836f6764f8eb9ea3e6d1afe0 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.html
@@ -80,8 +80,7 @@
                formControlName="display_name"
                name="display_name"
                id="display_name"
-               [invalid]="userForm.controls.display_name.invalid && (userForm.controls.display_name.dirty)"
-               [readonly]="editing"/>
+               [invalid]="userForm.showError('display_name', formDir)"/>
       </cds-text-label>
       <ng-template #displayNameError>
         <span class="invalid-feedback"