kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Moved update headline HTML into discussion model

Browse source
This commit is contained in:
Phil Hughes 2016-08-01 11:31:35 +01:00
parent d6e724d90f
commit ee62a2fd5a
3 changed files with 45 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
View file

@ -25,6 +25,9 @@
} }
}, },
computed: { computed: {
discussion: function () {
return this.discussions[this.discussionId];
},
note: function () { note: function () {
return CommentsStore.get(this.discussionId, this.noteId); return CommentsStore.get(this.discussionId, this.noteId);
}, },
@ -63,14 +66,14 @@
} }
promise.then((response) => { promise.then((response) => {
const data = response.json();
this.loading = false; this.loading = false;
if (response.status === 200) { if (response.status === 200) {
const data = response.json();
const resolved_by = data ? data.resolved_by : null; const resolved_by = data ? data.resolved_by : null;
CommentsStore.update(this.discussionId, this.noteId, !this.isResolved, resolved_by); CommentsStore.update(this.discussionId, this.noteId, !this.isResolved, resolved_by);
ResolveService.updateDiscussionHeadline(this.discussionId, data); this.discussion.updateHeadline(data);
} else { } else {
new Flash('An error occurred when trying to resolve a comment. Please try again.', 'alert'); new Flash('An error occurred when trying to resolve a comment. Please try again.', 'alert');
} }

14
app/assets/javascripts/diff_notes/models/discussion.js.es6
View file

@ -53,4 +53,18 @@ class DiscussionModel {
} }
} }
} }
updateHeadline (data) {
const $discussionHeadline = $(`.discussion[data-discussion-id="${this.id}"] .js-discussion-headline`);
if (data.discussion_headline_html) {
if ($discussionHeadline.length) {
$discussionHeadline.replaceWith(data.discussion_headline_html);
} else {
$(`.discussion[data-discussion-id="${this.id}"] .discussion-header`).append(data.discussion_headline_html);
}
} else {
$discussionHeadline.remove();
}
}
} }

66
app/assets/javascripts/diff_notes/services/resolve.js.es6
View file

@ -28,13 +28,34 @@
} }
toggleResolveForDiscussion(namespace, mergeRequestId, discussionId) { toggleResolveForDiscussion(namespace, mergeRequestId, discussionId) {
const isResolved = CommentsStore.state[discussionId].isResolved(); const discussion = CommentsStore.state[discussionId],
isResolved = discussion.isResolved();
let promise;
if (isResolved) { if (isResolved) {
return this.unResolveAll(namespace, mergeRequestId, discussionId); promise = this.unResolveAll(namespace, mergeRequestId, discussionId);
} else { } else {
return this.resolveAll(namespace, mergeRequestId, discussionId); promise = this.resolveAll(namespace, mergeRequestId, discussionId);
} }
promise.then((response) => {
discussion.loading = false;
if (response.status === 200) {
const data = response.json();
const resolved_by = data ? data.resolved_by : null;
if (isResolved) {
discussion.unResolveAllNotes();
} else {
discussion.resolveAllNotes(resolved_by);
}
discussion.updateHeadline(data);
} else {
new Flash('An error occurred when trying to resolve a discussion. Please try again.', 'alert');
}
})
} }
resolveAll(namespace, mergeRequestId, discussionId) { resolveAll(namespace, mergeRequestId, discussionId) {
@ -51,18 +72,7 @@
return this.discussionResource.save({ return this.discussionResource.save({
mergeRequestId, mergeRequestId,
discussionId discussionId
}, {}).then((response) => { }, {});
if (response.status === 200) {
const data = response.json();
const resolved_by = data ? data.resolved_by : null;
discussion.resolveAllNotes(resolved_by);
discussion.loading = false;
this.updateDiscussionHeadline(discussionId, data);
} else {
new Flash('An error occurred when trying to resolve a discussion. Please try again.', 'alert');
}
});
} }
unResolveAll(namespace, mergeRequestId, discussionId) { unResolveAll(namespace, mergeRequestId, discussionId) {
@ -76,31 +86,7 @@
return this.discussionResource.delete({ return this.discussionResource.delete({
mergeRequestId, mergeRequestId,
discussionId discussionId
}, {}).then((response) => { }, {});
if (response.status === 200) {
const data = response.json();
discussion.unResolveAllNotes();
discussion.loading = false;
this.updateDiscussionHeadline(discussionId, data);
} else {
new Flash('An error occurred when trying to unresolve a discussion. Please try again.', 'alert');
}
});
}
updateDiscussionHeadline(discussionId, data) {
const $discussionHeadline = $(`.discussion[data-discussion-id="${discussionId}"] .js-discussion-headline`);
if (data.discussion_headline_html) {
if ($discussionHeadline.length) {
$discussionHeadline.replaceWith(data.discussion_headline_html);
} else {
$(`.discussion[data-discussion-id="${discussionId}"] .discussion-header`).append(data.discussion_headline_html);
}
} else {
$discussionHeadline.remove();
}
} }
} }