diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/design_management/components/design_presentation.vue | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/design_management/components/design_presentation.vue')
-rw-r--r-- | app/assets/javascripts/design_management/components/design_presentation.vue | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/design_management/components/design_presentation.vue b/app/assets/javascripts/design_management/components/design_presentation.vue index 5c113b3dbed..84dbb2809d9 100644 --- a/app/assets/javascripts/design_management/components/design_presentation.vue +++ b/app/assets/javascripts/design_management/components/design_presentation.vue @@ -35,6 +35,10 @@ export default { required: false, default: 1, }, + resolvedDiscussionsExpanded: { + type: Boolean, + required: true, + }, }, data() { return { @@ -54,7 +58,10 @@ export default { }, computed: { discussionStartingNotes() { - return this.discussions.map(discussion => discussion.notes[0]); + return this.discussions.map(discussion => ({ + ...discussion.notes[0], + index: discussion.index, + })); }, currentCommentForm() { return (this.isAnnotating && this.currentAnnotationPosition) || null; @@ -305,6 +312,7 @@ export default { :notes="discussionStartingNotes" :current-comment-form="currentCommentForm" :disable-commenting="isDraggingDesign" + :resolved-discussions-expanded="resolvedDiscussionsExpanded" @openCommentForm="openCommentForm" @closeCommentForm="closeCommentForm" @moveNote="moveNote" |