1 files changed, 22 insertions, 9 deletions

diff --git a/app/assets/javascripts/boards/boards_util.js b/app/assets/javascripts/boards/boards_util.js
index 8062460f052..3a22b06c72e 100644
--- a/app/assets/javascripts/boards/boards_util.js
+++ b/app/assets/javascripts/boards/boards_util.js
@@ -1,7 +1,18 @@
 import { sortBy, cloneDeep } from 'lodash';
-import { TYPE_BOARD, TYPE_ITERATION, TYPE_MILESTONE, TYPE_USER } from '~/graphql_shared/constants';
+import {
+  TYPENAME_BOARD,
+  TYPENAME_ITERATION,
+  TYPENAME_MILESTONE,
+  TYPENAME_USER,
+} from '~/graphql_shared/constants';
 import { isGid, convertToGraphQLId } from '~/graphql_shared/utils';
-import { ListType, MilestoneIDs, AssigneeFilterType, MilestoneFilterType } from './constants';
+import {
+  ListType,
+  MilestoneIDs,
+  AssigneeFilterType,
+  MilestoneFilterType,
+  boardQuery,
+} from './constants';
 
 export function getMilestone() {
   return null;
@@ -40,9 +51,7 @@ export function formatListIssues(listIssues) {
   const boardItems = {};
 
   const listData = listIssues.nodes.reduce((map, list) => {
-    let sortedIssues = list.issues.edges.map((issueNode) => ({
-      ...issueNode.node,
-    }));
+    let sortedIssues = list.issues.nodes;
     if (list.listType !== ListType.closed) {
       sortedIssues = sortBy(sortedIssues, 'relativePosition');
     }
@@ -82,19 +91,19 @@ export function fullBoardId(boardId) {
   if (!boardId) {
     return null;
   }
-  return convertToGraphQLId(TYPE_BOARD, boardId);
+  return convertToGraphQLId(TYPENAME_BOARD, boardId);
 }
 
 export function fullIterationId(id) {
-  return convertToGraphQLId(TYPE_ITERATION, id);
+  return convertToGraphQLId(TYPENAME_ITERATION, id);
 }
 
 export function fullUserId(id) {
-  return convertToGraphQLId(TYPE_USER, id);
+  return convertToGraphQLId(TYPENAME_USER, id);
 }
 
 export function fullMilestoneId(id) {
-  return convertToGraphQLId(TYPE_MILESTONE, id);
+  return convertToGraphQLId(TYPENAME_MILESTONE, id);
 }
 
 export function fullLabelId(label) {
@@ -305,6 +314,10 @@ export function transformBoardConfig() {
   return '';
 }
 
+export function getBoardQuery(boardType) {
+  return boardQuery[boardType].query;
+}
+
 export default {
   getMilestone,
   formatIssue,