1 files changed, 18 insertions, 5 deletions
diff --git a/app/assets/javascripts/boards/components/board_content.vue b/app/assets/javascripts/boards/components/board_content.vue
index 14c781f588f..3c2659b00c9 100644
--- a/app/assets/javascripts/boards/components/board_content.vue
+++ b/app/assets/javascripts/boards/components/board_content.vue
@@ -3,8 +3,10 @@ import { GlAlert } from '@gitlab/ui';
 import { sortBy } from 'lodash';
 import produce from 'immer';
 import Draggable from 'vuedraggable';
+// eslint-disable-next-line no-restricted-imports
 import { mapState, mapActions } from 'vuex';
 import BoardAddNewColumn from 'ee_else_ce/boards/components/board_add_new_column.vue';
+import { s__ } from '~/locale';
 import { defaultSortableOptions } from '~/sortable/constants';
 import {
   DraggableItemTypes,
@@ -13,6 +15,7 @@ import {
   updateListQueries,
 } from 'ee_else_ce/boards/constants';
 import { calculateNewPosition } from 'ee_else_ce/boards/boards_util';
+import { setError } from '../graphql/cache_updates';
 import BoardColumn from './board_column.vue';
 
 export default {
@@ -122,7 +125,14 @@ export default {
         this.highlightedLists = this.highlightedLists.filter((id) => id !== listId);
       }, flashAnimationDuration);
     },
-    updateListPosition({
+    dismissError() {
+      if (this.isApolloBoard) {
+        setError({ message: null, captureError: false });
+      } else {
+        this.unsetError();
+      }
+    },
+    async updateListPosition({
       item: {
         dataset: { listId: movedListId, draggableItemType },
       },
@@ -153,7 +163,7 @@ export default {
       const targetPosition = this.boardListsById[displacedListId].position;
 
       try {
-        this.$apollo.mutate({
+        await this.$apollo.mutate({
           mutation: updateListQueries[this.issuableType].mutation,
           variables: {
             listId: movedListId,
@@ -195,8 +205,11 @@ export default {
             },
           },
         });
-      } catch {
-        // handle error
+      } catch (error) {
+        setError({
+          error,
+          message: s__('Boards|An error occurred while moving the list. Please try again.'),
+        });
       }
     },
   },
@@ -209,7 +222,7 @@ export default {
     data-qa-selector="boards_list"
     class="gl-flex-grow-1 gl-display-flex gl-flex-direction-column gl-min-h-0"
   >
-    <gl-alert v-if="errorToDisplay" variant="danger" :dismissible="true" @dismiss="unsetError">
+    <gl-alert v-if="errorToDisplay" variant="danger" :dismissible="true" @dismiss="dismissError">
       {{ errorToDisplay }}
     </gl-alert>
     <component