Show weight on new board issue (CE-backport)
This commit is contained in:
parent
a7f3d98054
commit
b896a8536f
3 changed files with 33 additions and 1 deletions
|
@ -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}`);
|
||||
|
|
|
@ -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', () => {
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in a new issue