1 files changed, 21 insertions, 17 deletions
diff --git a/app/assets/javascripts/boards/index.js b/app/assets/javascripts/boards/index.js
index 968832a092d..4c6f341828c 100644
--- a/app/assets/javascripts/boards/index.js
+++ b/app/assets/javascripts/boards/index.js
@@ -3,8 +3,9 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import BoardApp from '~/boards/components/board_app.vue';
 import '~/boards/filters/due_date_filters';
-import { BoardType, issuableTypes } from '~/boards/constants';
+import { BoardType } from '~/boards/constants';
 import store from '~/boards/stores';
+import { TYPE_ISSUE } from '~/issues/constants';
 import {
   NavigationType,
   isLoggedIn,
@@ -24,6 +25,7 @@ const apolloProvider = new VueApollo({
 
 function mountBoardApp(el) {
   const { boardId, groupId, fullPath, rootPath } = el.dataset;
+  const isApolloBoard = window.gon?.features?.apolloBoards;
 
   const rawFilterParams = queryToObject(window.location.search, { gatherArrays: true });
 
@@ -33,20 +35,22 @@ function mountBoardApp(el) {
 
   const boardType = el.dataset.parent;
 
-  store.dispatch('fetchBoard', {
-    fullPath,
-    fullBoardId: fullBoardId(boardId),
-    boardType,
-  });
+  if (!isApolloBoard) {
+    store.dispatch('fetchBoard', {
+      fullPath,
+      fullBoardId: fullBoardId(boardId),
+      boardType,
+    });
 
-  store.dispatch('setInitialBoardData', {
-    boardId,
-    fullBoardId: fullBoardId(boardId),
-    fullPath,
-    boardType,
-    disabled: parseBoolean(el.dataset.disabled) || true,
-    issuableType: issuableTypes.issue,
-  });
+    store.dispatch('setInitialBoardData', {
+      boardId,
+      fullBoardId: fullBoardId(boardId),
+      fullPath,
+      boardType,
+      disabled: parseBoolean(el.dataset.disabled) || true,
+      issuableType: TYPE_ISSUE,
+    });
+  }
 
   // eslint-disable-next-line no-new
   new Vue({
@@ -55,8 +59,8 @@ function mountBoardApp(el) {
     store,
     apolloProvider,
     provide: {
-      isApolloBoard: window.gon?.features?.apolloBoards,
-      fullBoardId: fullBoardId(boardId),
+      isApolloBoard,
+      initialBoardId: fullBoardId(boardId),
       disabled: parseBoolean(el.dataset.disabled),
       groupId: Number(groupId),
       rootPath,
@@ -72,7 +76,7 @@ function mountBoardApp(el) {
       labelsFilterBasePath: el.dataset.labelsFilterBasePath,
       releasesFetchPath: el.dataset.releasesFetchPath,
       timeTrackingLimitToHours: parseBoolean(el.dataset.timeTrackingLimitToHours),
-      issuableType: issuableTypes.issue,
+      issuableType: TYPE_ISSUE,
       emailsDisabled: parseBoolean(el.dataset.emailsDisabled),
       hasMissingBoards: parseBoolean(el.dataset.hasMissingBoards),
       weights: el.dataset.weights ? JSON.parse(el.dataset.weights) : [],