Merge branch 'design-management-issue-tab-ce' into 'master'
CE backport of design-management-issue-tab See merge request gitlab-org/gitlab-ce!25429
This commit is contained in:
commit
499ca7f2e2
|
@ -90,8 +90,15 @@ export default {
|
|||
this.fetchNotes();
|
||||
}
|
||||
},
|
||||
allDiscussions() {
|
||||
if (this.discussonsCount) {
|
||||
this.discussonsCount.textContent = this.allDiscussions.length;
|
||||
}
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.discussonsCount = document.querySelector('.js-discussions-count');
|
||||
|
||||
this.setNotesData(this.notesData);
|
||||
this.setNoteableData(this.noteableData);
|
||||
this.setUserData(this.userData);
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
= link_to 'Reopen issue', issue_path(@issue, issue: {state_event: :reopen}, format: 'json'), data: {original_text: "Reopen issue", alternative_text: "Comment & reopen issue"}, class: "btn btn-nr btn-reopen btn-comment js-note-target-reopen #{issue_button_visibility(@issue, false)}", title: 'Reopen issue'
|
||||
= link_to 'Close issue', issue_path(@issue, issue: {state_event: :close}, format: 'json'), data: {original_text: "Close issue", alternative_text: "Comment & close issue"}, class: "btn btn-nr btn-close btn-comment js-note-target-close #{issue_button_visibility(@issue, true)}", title: 'Close issue'
|
||||
|
||||
%section.js-vue-notes-event
|
||||
%section.issuable-discussion.js-vue-notes-event
|
||||
#js-vue-notes{ data: { notes_data: notes_data(@issue).to_json,
|
||||
noteable_data: serialize_issuable(@issue),
|
||||
noteable_type: 'Issue',
|
||||
|
|
|
@ -88,7 +88,6 @@
|
|||
#js-vue-discussion-filter{ data: { default_filter: current_user&.notes_filter_for(@issue), notes_filters: UserPreference.notes_filters.to_json } }
|
||||
= render 'new_branch' unless @issue.confidential?
|
||||
|
||||
%section.issuable-discussion
|
||||
= render 'projects/issues/discussion'
|
||||
= render_if_exists 'projects/issues/discussion'
|
||||
|
||||
= render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @issue.assignees
|
||||
|
|
|
@ -83,6 +83,8 @@ describe('note_app', () => {
|
|||
|
||||
describe('render', () => {
|
||||
beforeEach(() => {
|
||||
setFixtures('<div class="js-discussions-count"></div>');
|
||||
|
||||
Vue.http.interceptors.push(mockData.individualNoteInterceptor);
|
||||
wrapper = mountComponent();
|
||||
});
|
||||
|
@ -127,6 +129,14 @@ describe('note_app', () => {
|
|||
it('should render form comment button as disabled', () => {
|
||||
expect(wrapper.find('.js-note-new-discussion').attributes('disabled')).toEqual('disabled');
|
||||
});
|
||||
|
||||
it('updates discussions badge', done => {
|
||||
setTimeout(() => {
|
||||
expect(document.querySelector('.js-discussions-count').textContent).toEqual('2');
|
||||
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('while fetching data', () => {
|
||||
|
|
Loading…
Reference in New Issue