Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 19 deletions

diff --git a/app/assets/javascripts/sidebar/components/move/move_issue_button.vue b/app/assets/javascripts/sidebar/components/move/move_issue_button.vue
index 76c47305369..581537264db 100644
--- a/app/assets/javascripts/sidebar/components/move/move_issue_button.vue
+++ b/app/assets/javascripts/sidebar/components/move/move_issue_button.vue
@@ -26,10 +26,11 @@ export default {
     },
   },
   methods: {
-    moveIssue(targetProject) {
+    async moveIssue(targetProject) {
       this.moveInProgress = true;
-      return this.$apollo
-        .mutate({
+
+      try {
+        const { data } = await this.$apollo.mutate({
           mutation: moveIssueMutation,
           variables: {
             moveIssueInput: {
@@ -38,24 +39,25 @@ export default {
               targetProjectPath: targetProject.full_path,
             },
           },
-        })
-        .then(({ data = {} }) => {
-          if (!data.issueMove) return;
+        });
+
+        if (!data.issueMove) return;
+
+        const { errors } = data.issueMove;
+        if (errors?.length > 0) {
+          throw new Error(`Error moving the issue. Error message: ${errors[0].message}`);
+        }
 
-          const { errors } = data.issueMove;
-          if (errors?.length > 0) {
-            throw new Error(`Error moving the issue. Error message: ${errors[0].message}`);
-          }
-          visitUrl(data.issueMove?.issue.webUrl);
-        })
-        .catch((error) => {
-          this.moveInProgress = false;
-          createAlert({
-            message: this.$options.i18n.moveErrorMessage,
-            captureError: true,
-            error,
-          });
+        visitUrl(data.issueMove?.issue.webUrl);
+      } catch (error) {
+        createAlert({
+          message: this.$options.i18n.moveErrorMessage,
+          captureError: true,
+          error,
         });
+      } finally {
+        this.moveInProgress = false;
+      }
     },
   },
 };