1 files changed, 77 insertions, 6 deletions

diff --git a/app/assets/javascripts/boards/components/board_new_issue.vue b/app/assets/javascripts/boards/components/board_new_issue.vue
index 8b9fafca306..b68444fb011 100644
--- a/app/assets/javascripts/boards/components/board_new_issue.vue
+++ b/app/assets/javascripts/boards/components/board_new_issue.vue
@@ -1,30 +1,73 @@
 <script>
-import { mapActions, mapGetters, mapState } from 'vuex';
-import { getMilestone } from 'ee_else_ce/boards/boards_util';
+import { mapActions, mapGetters } from 'vuex';
+import { s__ } from '~/locale';
+import { getMilestone, formatIssueInput, getBoardQuery } from 'ee_else_ce/boards/boards_util';
 import BoardNewIssueMixin from 'ee_else_ce/boards/mixins/board_new_issue';
 
 import { toggleFormEventPrefix } from '../constants';
 import eventHub from '../eventhub';
+import { setError } from '../graphql/cache_updates';
 
 import BoardNewItem from './board_new_item.vue';
 import ProjectSelect from './project_select.vue';
 
 export default {
   name: 'BoardNewIssue',
+  i18n: {
+    errorFetchingBoard: s__('Boards|An error occurred while fetching board. Please try again.'),
+  },
   components: {
     BoardNewItem,
     ProjectSelect,
   },
   mixins: [BoardNewIssueMixin],
-  inject: ['groupId', 'fullPath', 'isGroupBoard'],
+  inject: ['boardType', 'groupId', 'fullPath', 'isGroupBoard', 'isEpicBoard', 'isApolloBoard'],
   props: {
     list: {
       type: Object,
       required: true,
     },
+    boardId: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      selectedProject: {},
+      board: {},
+    };
+  },
+  apollo: {
+    board: {
+      query() {
+        return getBoardQuery(this.boardType, this.isEpicBoard);
+      },
+      variables() {
+        return {
+          fullPath: this.fullPath,
+          boardId: this.boardId,
+        };
+      },
+      skip() {
+        return !this.isApolloBoard;
+      },
+      update(data) {
+        const { board } = data.workspace;
+        return {
+          ...board,
+          labels: board.labels?.nodes,
+        };
+      },
+      error(error) {
+        setError({
+          error,
+          message: this.$options.i18n.errorFetchingBoard,
+        });
+      },
+    },
   },
   computed: {
-    ...mapState(['selectedProject']),
     ...mapGetters(['getBoardItemsByList']),
     formEventPrefix() {
       return toggleFormEventPrefix.issue;
@@ -42,8 +85,20 @@ export default {
       const labels = this.list.label ? [this.list.label] : [];
       const assignees = this.list.assignee ? [this.list.assignee] : [];
       const milestone = getMilestone(this.list);
-      const firstItemId = this.getBoardItemsByList(this.list.id)[0]?.id;
 
+      if (this.isApolloBoard) {
+        return this.addNewIssueToList({
+          issueInput: {
+            title,
+            labelIds: labels?.map((l) => l.id),
+            assigneeIds: assignees?.map((a) => a?.id),
+            milestoneId: milestone?.id,
+            projectPath: this.projectPath,
+          },
+        });
+      }
+
+      const firstItemId = this.getBoardItemsByList(this.list.id)[0]?.id;
       return this.addListNewIssue({
         list: this.list,
         issueInput: {
@@ -58,6 +113,22 @@ export default {
         this.cancel();
       });
     },
+    addNewIssueToList({ issueInput }) {
+      const { labels, assignee, milestone, weight } = this.board;
+      const config = {
+        labels,
+        assigneeId: assignee?.id || null,
+        milestoneId: milestone?.id || null,
+        weight,
+      };
+      const input = formatIssueInput(issueInput, config);
+
+      if (!this.isGroupBoard) {
+        input.projectPath = this.fullPath;
+      }
+
+      this.$emit('addNewIssue', input);
+    },
     cancel() {
       eventHub.$emit(`${this.formEventPrefix}${this.list.id}`);
     },
@@ -74,6 +145,6 @@ export default {
     @form-submit="submit"
     @form-cancel="cancel"
   >
-    <project-select v-if="isGroupBoard" :group-id="groupId" :list="list" />
+    <project-select v-if="isGroupBoard" v-model="selectedProject" :list="list" />
   </board-new-item>
 </template>