diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-14 09:10:18 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-14 09:10:18 +0300 |
commit | 54a8c42f35399da6e259baef16b9cc9be287d59e (patch) | |
tree | 51dfe467d7e1514fb6c2a3aabfa079717cb7191d /app/assets/javascripts/design_management | |
parent | 8f30cb223b5e15af8b21ff313e81f70d46c5a42a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/design_management')
-rw-r--r-- | app/assets/javascripts/design_management/components/design_overlay.vue | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/design_management/components/design_overlay.vue b/app/assets/javascripts/design_management/components/design_overlay.vue index ecca8606f89..7815a57ce18 100644 --- a/app/assets/javascripts/design_management/components/design_overlay.vue +++ b/app/assets/javascripts/design_management/components/design_overlay.vue @@ -70,6 +70,13 @@ export default { ? this.getNotePositionStyle(this.movingNoteNewPosition) : this.getNotePositionStyle(this.currentCommentForm); }, + visibleNotes() { + if (this.resolvedDiscussionsExpanded) { + return this.notes; + } + + return this.notes.filter((note) => !note.resolved); + }, }, methods: { setNewNoteCoordinates({ x, y }) { @@ -272,8 +279,7 @@ export default { ></button> <design-note-pin - v-for="note in notes" - v-if="resolvedDiscussionsExpanded || !note.resolved" + v-for="note in visibleNotes" :key="note.id" :label="note.index" :position=" |