commit 8a4c47e111906ce0f9beefb762c2ecfe9722ce69
author Kasper Nilsson <kaspern@google.com> Thu Nov 09 16:08:06 2017 -0800
committer Kasper Nilsson <kaspern@google.com> Mon Nov 13 14:15:49 2017 -0800
tree 02d486dbce53d6a822db13456b592cac9d972959
parent 0a420520fe6891580a47a8a3abd3a397448cae49

Allow username editing if permitted by project cfg

Change-Id: I57986af606833c20535c719a1f7540d22d4602bb

polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js

diff --git a/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js b/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js
index 5d7f8a6..03795f6 100644
--- a/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js
+++ b/polygerrit-ui/app/elements/settings/gr-account-info/gr-account-info.js
@@ -24,21 +24,31 @@
      */
 
     properties: {
-      mutable: {
+      usernameMutable: {
         type: Boolean,
         notify: true,
-        computed: '_computeMutable(_serverConfig)',
+        computed: '_computeUsernameMutable(_serverConfig)',
+      },
+      nameMutable: {
+        type: Boolean,
+        notify: true,
+        computed: '_computeNameMutable(_serverConfig)',
       },
       hasUnsavedChanges: {
         type: Boolean,
         notify: true,
-        computed: '_computeHasUnsavedChanges(_hasNameChange, _hasStatusChange)',
+        computed: '_computeHasUnsavedChanges(_hasNameChange, ' +
+            '_hasUsernameChange, _hasStatusChange)',
       },
 
       _hasNameChange: {
         type: Boolean,
         value: false,
       },
+      _hasUsernameChange: {
+        type: Boolean,
+        value: false,
+      },
       _hasStatusChange: {
         type: Boolean,
         value: false,
@@ -58,6 +68,7 @@
 
     observers: [
       '_nameChanged(_account.name)',
+      '_usernameChanged(_account.username)',
       '_statusChanged(_account.status)',
     ],
 
@@ -88,6 +99,7 @@
       // Set only the fields that have changed.
       // Must be done in sequence to avoid race conditions (@see Issue 5721)
       return this._maybeSetName()
+          .then(this._maybeSetUsername.bind(this))
           .then(this._maybeSetStatus.bind(this))
           .then(() => {
             this._hasNameChange = false;
@@ -98,9 +110,15 @@
     },
 
     _maybeSetName() {
-      return this._hasNameChange && this.mutable ?
-                this.$.restAPI.setAccountName(this._account.name) :
-                Promise.resolve();
+      return this._hasNameChange && this.nameMutable ?
+          this.$.restAPI.setAccountName(this._account.name) :
+          Promise.resolve();
+    },
+
+    _maybeSetUsername() {
+      return this._hasUsernameChange && this.usernameMutable ?
+          this.$.restAPI.setAccountUsername(this._account.username) :
+          Promise.resolve();
     },
 
     _maybeSetStatus() {
@@ -109,11 +127,15 @@
           Promise.resolve();
     },
 
-    _computeHasUnsavedChanges(name, status) {
-      return name || status;
+    _computeHasUnsavedChanges(nameChanged, usernameChanged, statusChanged) {
+      return nameChanged || usernameChanged || statusChanged;
     },
 
-    _computeMutable(config) {
+    _computeUsernameMutable(config) {
+      return config.auth.editable_account_fields.includes('USER_NAME');
+    },
+
+    _computeNameMutable(config) {
       return config.auth.editable_account_fields.includes('FULL_NAME');
     },
 
@@ -122,6 +144,11 @@
       this._hasStatusChange = true;
     },
 
+    _usernameChanged() {
+      if (this._loading) { return; }
+      this._hasUsernameChange = true;
+    },
+
     _nameChanged() {
       if (this._loading) { return; }
       this._hasNameChange = true;