Merge branch 'winh-show-weight-on-new-board-issue-ce' into 'master'

Show weight on new board issue (CE-backport) See merge request gitlab-org/gitlab-ce!32746

Merge branch 'winh-show-weight-on-new-board-issue-ce' into 'master'
Show weight on new board issue (CE-backport) See merge request gitlab-org/gitlab-ce!32746
7cae5773 · Kushal Pandya · a7f3d980 · b896a853 · 7cae5773 · 7cae5773
--- a/app/assets/javascripts/boards/components/board_new_issue.vue
+++ b/app/assets/javascripts/boards/components/board_new_issue.vue
@@ -2,9 +2,9 @@
 import $ from 'jquery';
 import { GlButton } from '@gitlab/ui';
 import { getMilestone } from 'ee_else_ce/boards/boards_util';
+import ListIssue from 'ee_else_ce/boards/models/issue';
 import eventHub from '../eventhub';
 import ProjectSelect from './project_select.vue';
-import ListIssue from '../models/issue';
 import boardsStore from '../stores/boards_store';

 export default {
@@ -54,6 +54,9 @@ export default {
      const assignees = this.list.assignee ? [this.list.assignee] : [];
      const milestone = getMilestone(this.list);

+      const { weightFeatureAvailable } = boardsStore;
+      const { weight } = weightFeatureAvailable ? boardsStore.state.currentBoard : {};
+
      const issue = new ListIssue({
        title: this.title,
        labels,
@@ -61,6 +64,7 @@ export default {
        assignees,
        milestone,
        project_id: this.selectedProject.id,
+        weight,
      });

      eventHub.$emit(`scroll-board-list-${this.list.id}`);

--- a/spec/javascripts/boards/board_new_issue_spec.js
+++ b/spec/javascripts/boards/board_new_issue_spec.js
@@ -171,6 +171,32 @@ describe('Issue boards new issue form', () => {
        .then(done)
        .catch(done.fail);
    });
+
+    it('sets detail weight after submit', done => {
+      boardsStore.weightFeatureAvailable = true;
+      vm.title = 'submit issue';
+
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
+          expect(boardsStore.detail.list.weight).toBe(list.weight);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
+
+    it('does not set detail weight after submit', done => {
+      boardsStore.weightFeatureAvailable = false;
+      vm.title = 'submit issue';
+
+      Vue.nextTick()
+        .then(submitIssue)
+        .then(() => {
+          expect(boardsStore.detail.list.weight).toBe(list.weight);
+        })
+        .then(done)
+        .catch(done.fail);
+    });
  });

  describe('submit error', () => {

--- a/spec/javascripts/boards/mock_data.js
+++ b/spec/javascripts/boards/mock_data.js
@@ -12,6 +12,7 @@ export const listObj = {
  position: 0,
  title: 'Test',
  list_type: 'label',
+  weight: 3,
  label: {
    id: 5000,
    title: 'Testing',
@@ -26,6 +27,7 @@ export const listObjDuplicate = {
  position: 1,
  title: 'Test',
  list_type: 'label',
+  weight: 3,
  label: {
    id: listObj.label.id,
    title: 'Testing',