From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Wed, 6 Nov 2019 17:10:09 +0000 (-0500)
Subject: Bug 1567696 - Forms for approval requests should indicate XHR / progress
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c46c56fc88a74a7e40f303e1dfd34447ba61693;p=thirdparty%2Fbugzilla.git

Bug 1567696 - Forms for approval requests should indicate XHR / progress
---

diff --git a/extensions/BMO/template/en/default/hook/flag/type_comment-form.html.tmpl b/extensions/BMO/template/en/default/hook/flag/type_comment-form.html.tmpl
index c277b7a7a..bd1c97dc1 100644
--- a/extensions/BMO/template/en/default/hook/flag/type_comment-form.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/flag/type_comment-form.html.tmpl
@@ -6,6 +6,9 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
+[%# These forms are available only when updating an attachment %]
+[% RETURN UNLESS template.name == "attachment/edit.html.tmpl" %]
+
 <meta name="extra-patch-types" content="text/x-phabricator-request">
 
 <template class="approval-request" data-flags="approval-mozilla-beta approval-mozilla-release">
diff --git a/extensions/FlagTypeComment/web/js/ftc.js b/extensions/FlagTypeComment/web/js/ftc.js
index f887ea2a4..39e862001 100644
--- a/extensions/FlagTypeComment/web/js/ftc.js
+++ b/extensions/FlagTypeComment/web/js/ftc.js
@@ -26,16 +26,21 @@ Bugzilla.FlagTypeComment = class FlagTypeComment {
     if (this.$flags && this.$comment) {
       const $extra_patch_types = document.querySelector('meta[name="extra-patch-types"]');
 
+      /** @type {HTMLFormElement} */
       this.$form = this.$comment.form;
+
       this.bug_id = Number(this.$form.bugid.value);
       this.attachment_id = Number(this.$form.id.value);
       this.extra_patch_types = $extra_patch_types ? $extra_patch_types.content.split(' ') : [];
       this.selects = [...this.$flags.querySelectorAll('.flag_select')];
-      this.selects.forEach($select => $select.addEventListener('change', () => this.flag_onselect($select)));
       this.$fieldset_wrapper = this.$flags.parentElement.appendChild(document.createElement('div'));
       this.$fieldset_wrapper.id = 'approval-request-fieldset-wrapper';
       this.$comment_wrapper = document.querySelector('#smallCommentFrame') || this.$comment.parentElement;
+      this.$submit = this.$form.querySelector('input[type="submit"]');
+      this.$status = this.$form.querySelector('#update_container [role="status"]');
+
       this.$form.addEventListener('submit', event => this.form_onsubmit(event));
+      this.selects.forEach($select => $select.addEventListener('change', () => this.flag_onselect($select)));
     }
   }
 
@@ -237,11 +242,17 @@ Bugzilla.FlagTypeComment = class FlagTypeComment {
   }
 
   /**
-   * Convert the input values into comment text and remove the temporary fieldset before submitting the form.
+   * Called when the user tries to submit the form. Convert the input values to comment text, and send it in background
+   * along with other flag updates.
    * @param {Event} event `submit` event.
    * @returns {Boolean} `true` when submitting the form normally if no fieldset has been inserted, `false` otherwise.
    */
   async form_onsubmit(event) {
+    if (this.submitting) {
+      return false;
+    }
+
+    // Submit the form normally if no fieldsets can be found
     if (!this.inserted_fieldsets.length) {
       return true;
     }
@@ -249,6 +260,11 @@ Bugzilla.FlagTypeComment = class FlagTypeComment {
     // Prevent auto-submission
     event.preventDefault();
 
+    // Update the button
+    this.$submit.disabled = this.submitting = true;
+    this.$status.textContent = 'Sending form data…';
+
+    const requests = [];
     const $markdown_off = this.$form.querySelector('input[name="markdown_off"]');
 
     // Enable Markdown for any regular patches. Phabricator requests don't come with this hidden `<input>`
@@ -259,45 +275,59 @@ Bugzilla.FlagTypeComment = class FlagTypeComment {
     // Convert the form values to Markdown comment
     this.inserted_fieldsets.forEach($fieldset => this.add_comment(this.create_comment($fieldset)));
 
-    // Submit the form via XHR before API requests to make sure the change is notified via email
-    await new Promise(resolve => {
-      const request = new XMLHttpRequest();
+    try {
+      // Submit the form data via XHR before API requests to make sure the change is notified via email
+      await new Promise((resolve, reject) => {
+        const request = new XMLHttpRequest();
+
+        request.open('POST', `${BUGZILLA.config.basepath}attachment.cgi`);
+        request.addEventListener('load', () => resolve());
+        request.addEventListener('error', () => reject());
+        request.send(new FormData(this.$form));
+      });
+    } catch (ex) {
+      alert('The form could not be submitted. Please try again later.');
 
-      request.open('POST', `${BUGZILLA.config.basepath}attachment.cgi`);
-      request.addEventListener('loadend', () => resolve());
-      request.send(new FormData(this.$form));
-    });
+      // Restore the Submit button
+      this.$submit.disabled = this.submitting = false;
+      this.$status.textContent = '';
+
+      // Stay on the same page for recovery
+      return false;
+    }
+
+    this.$status.textContent = 'Updating flags…';
 
     // Request approval for other patches if any
-    await Promise.all([...this.inserted_fieldsets].map($fieldset => new Promise(async resolve => {
+    for (const $fieldset of this.inserted_fieldsets) {
       const ids = [...$fieldset.querySelectorAll('tr.other-patches input:checked')]
         .map($input => Number($input.dataset.id));
       const flags = this.find_selectors($fieldset).map($select => ({ name: $select.dataset.name, status: '?' }));
 
       if (ids.length && flags.length) {
-        try {
-          await Bugzilla.API.put(`bug/attachment/${ids[0]}`, { ids, flags });
-        } catch (ex) {}
+        requests.push(Bugzilla.API.put(`bug/attachment/${ids[0]}`, { ids, flags }));
       }
-
-      resolve();
-    })));
+    }
 
     // Collect bug flags from checkboxes
-    const bug_flags = [...this.$fieldset_wrapper.querySelectorAll('input[data-bug-flag]:checked')]
+    const flags = [...this.$fieldset_wrapper.querySelectorAll('input[data-bug-flag]:checked')]
       .map($input => ({ name: $input.getAttribute('data-bug-flag'), status: '+' }));
 
     // Update bug flags if needed
-    if (bug_flags.length) {
-      await new Promise(async resolve => {
-        try {
-          await Bugzilla.API.put(`bug/${this.bug_id}`, { flags: bug_flags });
-        } catch (ex) {}
+    if (flags.length) {
+      requests.push(Bugzilla.API.put(`bug/${this.bug_id}`, { flags }));
+    }
 
-        resolve();
-      });
+    try {
+      // Send all the API requests
+      await Promise.all(requests);
+    } catch (ex) {
+      // Just show an alert, because it's hard to only recover specific flags
+      alert('One or more flags could not be updated. Please try again later.');
     }
 
+    this.$status.textContent = 'Redirecting to the bug…';
+
     // Redirect to the bug once everything is done
     location.href = `${BUGZILLA.config.basepath}show_bug.cgi?id=${this.bug_id}`;
 
diff --git a/skins/standard/attachment.css b/skins/standard/attachment.css
index af1d3018b..d42aeeb1b 100644
--- a/skins/standard/attachment.css
+++ b/skins/standard/attachment.css
@@ -227,14 +227,16 @@ textarea.bz_private {
   border: 1px solid var(--accent-color-pink-1);
 }
 
-#update {
+#update_container {
+  display: flex;
+  align-items: center;
   clear: both;
-  display: block;
+  padding: 1.5em 0;
 }
 
-div#update_container {
-  clear: both;
-  padding: 1.5em 0;
+#update_container [role="status"] {
+  margin-left: 8px;
+  font-style: italic;
 }
 
 #attachment_flags p {
diff --git a/skins/standard/global.css b/skins/standard/global.css
index e2bce700b..5b2e7c983 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -299,7 +299,7 @@
     --control-background-color: rgb(35, 36, 37);
     --control-border-color: rgb(60, 61, 62);
     --selected-control-background-color: rgb(60, 61, 62);
-    --disabled-control-foreground-color: rgb(90, 91, 92);
+    --disabled-control-foreground-color: rgb(110, 111, 112);
     --scrollbar-color: rgb(70, 71, 72) var(--application-background-color);
 
     /** Button */
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 348e80da8..ca634ddd4 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -290,6 +290,7 @@
   [% IF user.id %]
     <div id="update_container">
       <input type="submit" value="Submit" id="update">
+      <span role="status"></span>
     </div>
   [% END %]
 </form>