From c90138de9466015caa2c5ede27a5665a896554ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Cass=C3=A9?= <vincent.casse@corp.ovh.com>
Date: Mon, 28 Aug 2023 14:46:07 +0200
Subject: [PATCH] fix(user management): required "group" field not well
 validated by form (#9897)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In "Add user" form, "group" field was defined by default with an
impossible value. So form validator doesn't see issue if field was
not filled by customer. But customer was getting a strange error.

ref: MANAGER-12070

Signed-off-by: Vincent Cassé <vincent.casse@corp.ovh.com>
---
 .../user/users/add/user-users-add.controller.js  |  4 +---
 .../account/user/users/add/user-users-add.html   | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/manager/apps/dedicated/client/app/account/user/users/add/user-users-add.controller.js b/packages/manager/apps/dedicated/client/app/account/user/users/add/user-users-add.controller.js
index b2530e3dbaf4..5e57f28f6e36 100644
--- a/packages/manager/apps/dedicated/client/app/account/user/users/add/user-users-add.controller.js
+++ b/packages/manager/apps/dedicated/client/app/account/user/users/add/user-users-add.controller.js
@@ -17,9 +17,7 @@ export default class UserAccountUsersAddCtrl {
     this.alerter = Alerter;
     this.$translate = $translate;
     this.me = coreConfig.getUser();
-    this.user = {
-      group: 'REGULAR',
-    };
+    this.user = {};
     this.groups = [];
     this.loader = true;
     this.PASSWORD_MIN_LENGTH = 8;
diff --git a/packages/manager/apps/dedicated/client/app/account/user/users/add/user-users-add.html b/packages/manager/apps/dedicated/client/app/account/user/users/add/user-users-add.html
index 693df2ad835b..ab7de2c67e8d 100644
--- a/packages/manager/apps/dedicated/client/app/account/user/users/add/user-users-add.html
+++ b/packages/manager/apps/dedicated/client/app/account/user/users/add/user-users-add.html
@@ -140,7 +140,10 @@
                     </span>
                 </div>
 
-                <div class="form-group">
+                <div
+                    class="form-group"
+                    data-ng-class="{ 'has-error': $ctrl.userAccountUsersAddForm.group.$touched && $ctrl.userAccountUsersAddForm.group.$invalid }"
+                >
                     <label
                         class="control-label"
                         for="group"
@@ -156,6 +159,17 @@
                         data-ng-model="$ctrl.user.group"
                     >
                     </select>
+                    <span
+                        class="help-block"
+                        role="alert"
+                        data-ng-if="$ctrl.userAccountUsersAddForm.group.$touched"
+                        data-ng-messages="$ctrl.userAccountUsersAddForm.group.$touched && $ctrl.userAccountUsersAddForm.group.$error"
+                    >
+                        <span
+                            data-ng-message="required"
+                            data-translate="user_users_add_required"
+                        ></span>
+                    </span>
                 </div>
 
                 <div