Fix issue in users admin when editing user without scm accounts

diff --git a/server/sonar-web/src/main/js/api/users.ts b/server/sonar-web/src/main/js/api/users.ts
index f78343b59695a75f078f85bd40e65219d01d57b5..d04b71bcd55b2c56bcf52509400d4918657da4a1 100644 (file)
--- a/server/sonar-web/src/main/js/api/users.ts
+++ b/server/sonar-web/src/main/js/api/users.ts
@@ -33,7 +33,7 @@ export interface User {
   name: string;
   active: boolean;
   email?: string;
-  scmAccounts: string[];
+  scmAccounts?: string[];
   groups?: string[];
   tokensCount?: number;
   local: boolean;
@@ -90,7 +90,7 @@ export function updateUser(data: {
   email?: string;
   login: string;
   name?: string;
-  scmAccount: string[];
+  scmAccount?: string;
 }): Promise<User> {
   return postJSON('/api/users/update', data);
 }

diff --git a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
index 292d13f85c8509dc02d4ea529231deb3219595dc..500594e7413b825211ec3744cafc1774135d83e8 100644 (file)
--- a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
+++ b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx
@@ -54,7 +54,7 @@ export default class UserForm extends React.PureComponent<Props, State> {
         login: user.login,
         name: user.name,
         password: '',
-        scmAccounts: user.scmAccounts,
+        scmAccounts: user.scmAccounts || [],
         submitting: false
       };
     } else {
@@ -124,7 +124,7 @@ export default class UserForm extends React.PureComponent<Props, State> {
       email: this.state.email || undefined,
       login: this.state.login,
       name: this.state.name,
-      scmAccount: uniq(this.state.scmAccounts)
+      scmAccount: uniq(this.state.scmAccounts).join(',')
     }).then(() => {
       this.props.onUpdateUsers();
       this.props.onClose();