From 2aad2d6677bd7ccf530cf8b602f809399c2f143f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 23 Apr 2021 15:40:39 +0200
Subject: [PATCH 1/5] Proper error handling when fetching comments fails
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../card/CardSidebarTabComments.vue           | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/components/card/CardSidebarTabComments.vue b/src/components/card/CardSidebarTabComments.vue
index ffbac760c..c12d2eff8 100644
--- a/src/components/card/CardSidebarTabComments.vue
+++ b/src/components/card/CardSidebarTabComments.vue
@@ -23,8 +23,8 @@
 		</ul>
 		<div v-else-if="isLoading" class="icon icon-loading" />
 		<div v-else class="emptycontent">
-			<div class="icon-comment" />
-			<p>{{ t('deck', 'No comments yet. Begin the discussion!') }}</p>
+			<div :class="{ 'icon-comment': !error, 'icon-error': error }" />
+			<p>{{ error || t('deck', 'No comments yet. Begin the discussion!') }}</p>
 		</div>
 	</div>
 </template>
@@ -60,6 +60,7 @@ export default {
 			newComment: '',
 			isLoading: false,
 			currentUser: getCurrentUser(),
+			error: null,
 		}
 	},
 	computed: {
@@ -85,19 +86,33 @@ export default {
 	},
 	methods: {
 		async infiniteHandler($state) {
-			await this.loadMore()
-			if (this.hasMoreComments(this.card.id)) {
-				$state.loaded()
-			} else {
+			this.error = null
+			try {
+				await this.loadMore()
+				if (this.hasMoreComments(this.card.id)) {
+					$state.loaded()
+				} else {
+					$state.complete()
+				}
+			} catch (e) {
+				console.error('Failed to fetch more comments during infinite loading', e)
+				this.error = t('deck', 'Failed to load comments')
 				$state.complete()
 			}
 		},
 		async loadComments() {
+			this.error = null
 			this.isLoading = true
-			await this.$store.dispatch('fetchComments', { cardId: this.card.id })
-			this.isLoading = false
-			if (this.card.commentsUnread > 0) {
-				await this.$store.dispatch('markCommentsAsRead', this.card.id)
+			try {
+				await this.$store.dispatch('fetchComments', { cardId: this.card.id })
+				this.isLoading = false
+				if (this.card.commentsUnread > 0) {
+					await this.$store.dispatch('markCommentsAsRead', this.card.id)
+				}
+			} catch (e) {
+				this.isLoading = false
+				console.error('Failed to fetch more comments during infinite loading', e)
+				this.error = t('deck', 'Failed to load comments')
 			}
 		},
 		async createComment(content) {

From 3c6e6bb29c9102f6c0ec41c76f40a4da5b3b93b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 23 Apr 2021 15:40:55 +0200
Subject: [PATCH 2/5] Wrap lines properly in comment text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 src/components/card/CommentForm.vue | 5 +++++
 src/css/comments.scss               | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/components/card/CommentForm.vue b/src/components/card/CommentForm.vue
index aae2acca4..5d38d35b9 100644
--- a/src/components/card/CommentForm.vue
+++ b/src/components/card/CommentForm.vue
@@ -41,6 +41,7 @@
 					</span>
 				</template>
 				<div ref="contentEditable"
+					class="comment-form__contenteditable"
 					contenteditable
 					@keydown.enter="handleKeydown"
 					@paste="onPaste"
@@ -175,6 +176,10 @@ export default {
 <style scoped lang="scss">
 	@import '../../css/comments';
 
+	.comment-form__contenteditable {
+		word-break: break-word;
+	}
+
 	.atwho-wrap {
 		width: 100%;
 		& > div[contenteditable] {
diff --git a/src/css/comments.scss b/src/css/comments.scss
index e58da2e6a..f2fa497a2 100644
--- a/src/css/comments.scss
+++ b/src/css/comments.scss
@@ -48,4 +48,5 @@
 
 .comment--content {
 	margin-left: 44px;
+	word-break: break-word;
 }

From 70cf89a52089a031952e349a4986201206810bf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 23 Apr 2021 15:41:22 +0200
Subject: [PATCH 3/5] Fix faulty path when fetching comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 src/services/CommentApi.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/CommentApi.js b/src/services/CommentApi.js
index dae7b3e77..34109cdc8 100644
--- a/src/services/CommentApi.js
+++ b/src/services/CommentApi.js
@@ -31,7 +31,7 @@ export class CommentApi {
 	}
 
 	async loadComments({ cardId, limit, offset }) {
-		const api = await axios.get(generateOcsUrl(`apps/deck/api/v1.0/cards${cardId}/comments`), {
+		const api = await axios.get(generateOcsUrl(`apps/deck/api/v1.0/cards/${cardId}/comments`), {
 			params: { limit, offset },
 			headers: { 'OCS-APIRequest': 'true' },
 		})

From 0a9c846ae993109976265bd4fad9a794bd2b2b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Fri, 23 Apr 2021 16:34:29 +0200
Subject: [PATCH 4/5] Allow to cancel repies and adapt comment ui to talk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 .../card/CardSidebarTabComments.vue           | 11 ++-
 src/components/card/CommentForm.vue           |  1 +
 src/components/card/CommentItem.vue           | 75 +++++++++++++++----
 3 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/src/components/card/CardSidebarTabComments.vue b/src/components/card/CardSidebarTabComments.vue
index c12d2eff8..d10260cb6 100644
--- a/src/components/card/CardSidebarTabComments.vue
+++ b/src/components/card/CardSidebarTabComments.vue
@@ -7,7 +7,11 @@
 			</span>
 		</div>
 
-		<CommentItem v-if="replyTo" :comment="replyTo" :reply="true" />
+		<CommentItem v-if="replyTo"
+			:comment="replyTo"
+			:reply="true"
+			:preview="true"
+			@cancel="cancelReply" />
 		<CommentForm v-model="newComment" @submit="createComment" />
 
 		<ul v-if="getCommentsForCard(card.id).length > 0" id="commentsFeed">
@@ -36,6 +40,7 @@ import CommentItem from './CommentItem'
 import CommentForm from './CommentForm'
 import InfiniteLoading from 'vue-infinite-loading'
 import { getCurrentUser } from '@nextcloud/auth'
+
 export default {
 	name: 'CardSidebarTabComments',
 	components: {
@@ -101,6 +106,7 @@ export default {
 			}
 		},
 		async loadComments() {
+			this.$store.dispatch('setReplyTo', null)
 			this.error = null
 			this.isLoading = true
 			try {
@@ -130,6 +136,9 @@ export default {
 			await this.$store.dispatch('fetchMore', { cardId: this.card.id })
 			this.isLoading = false
 		},
+		cancelReply() {
+			this.$store.dispatch('setReplyTo', null)
+		},
 	},
 }
 </script>
diff --git a/src/components/card/CommentForm.vue b/src/components/card/CommentForm.vue
index 5d38d35b9..11a450b0d 100644
--- a/src/components/card/CommentForm.vue
+++ b/src/components/card/CommentForm.vue
@@ -178,6 +178,7 @@ export default {
 
 	.comment-form__contenteditable {
 		word-break: break-word;
+		border-radius: var(--border-radius-large)
 	}
 
 	.atwho-wrap {
diff --git a/src/components/card/CommentItem.vue b/src/components/card/CommentItem.vue
index 70d10a2f0..118ad0f4e 100644
--- a/src/components/card/CommentItem.vue
+++ b/src/components/card/CommentItem.vue
@@ -1,10 +1,22 @@
 <template>
-	<div v-if="reply" class="reply">
-		<span class="reply--hint">{{ t('deck', 'In reply to') }} <UserBubble :user="comment.actorId" :display-name="comment.actorDisplayName" /></span>
-		<RichText class="comment--content"
-			:text="richText(comment)"
-			:arguments="richArgs(comment)"
-			:autolink="true" />
+	<div v-if="reply" class="reply" :class="{ 'reply--preview': preview }">
+		<div class="reply--wrapper">
+			<div class="reply--header">
+				<div class="reply--hint">
+					{{ t('deck', 'In reply to') }}
+					<UserBubble :user="comment.actorId" :display-name="comment.actorDisplayName" />
+				</div>
+				<Actions v-if="preview" class="reply--cancel">
+					<ActionButton icon="icon-close" @click="$emit('cancel')">
+						{{ t('deck', 'Cancel reply') }}
+					</ActionButton>
+				</Actions>
+			</div>
+			<RichText class="comment--content"
+				:text="richText(comment)"
+				:arguments="richArgs(comment)"
+				:autolink="true" />
+		</div>
 	</div>
 	<li v-else class="comment">
 		<template>
@@ -14,13 +26,19 @@
 					{{ comment.actorDisplayName }}
 				</span>
 				<Actions v-show="!edit" :force-menu="true">
-					<ActionButton icon="icon-reply" @click="replyTo()">
+					<ActionButton icon="icon-reply" :close-after-click="true" @click="replyTo()">
 						{{ t('deck', 'Reply') }}
 					</ActionButton>
-					<ActionButton v-if="canEdit" icon="icon-rename" @click="showUpdateForm()">
+					<ActionButton v-if="canEdit"
+						icon="icon-rename"
+						:close-after-click="true"
+						@click="showUpdateForm()">
 						{{ t('deck', 'Update') }}
 					</ActionButton>
-					<ActionButton v-if="canEdit" icon="icon-delete" @click="deleteComment()">
+					<ActionButton v-if="canEdit"
+						icon="icon-delete"
+						:close-after-click="true"
+						@click="deleteComment()">
 						{{ t('deck', 'Delete') }}
 					</ActionButton>
 				</Actions>
@@ -86,6 +104,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		preview: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -175,20 +197,41 @@ export default {
 	@import '../../css/comments';
 
 	.reply {
-		border-left: 3px solid var(--color-primary-element);
-		padding-left: 5px;
-		margin-left: 2px;
-		margin-bottom: 5px;
+		margin: 0 0 0 44px;
+
+		&.reply--preview {
+			margin: 4px 0;
+			padding: 8px;
+			background-color: var(--color-background-hover);
+			border-radius: var(--border-radius-large);
+
+			.reply--wrapper {
+				margin: 8px;
+			}
+
+			.reply--cancel {
+				margin-right: -12px;
+				margin-top: -12px;
+			}
+		}
+
+		.reply--wrapper {
+			border-left: 4px solid var(--color-border-dark);
+			padding-left: 8px;
+		}
 
 		&::v-deep .rich-text--wrapper {
 			margin-top: -3px;
-			color: var(--color-text-light);
+			color: var(--color-text-lighter);
+		}
+
+		.reply--header {
+			display: flex;
 		}
 
 		.reply--hint {
-			font-size: 0.9em;
 			color: var(--color-text-lighter);
-			vertical-align: top;
+			flex-grow: 1;
 		}
 
 		.comment--content {

From bbf0394df217ff5b2def5901e56023e22710e219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 28 Apr 2021 13:22:23 +0200
Subject: [PATCH 5/5] Show comment counter and highlight if unread comments are
 available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 css/icons.scss                         |  4 +++-
 lib/Db/Card.php                        |  2 ++
 lib/Service/CardService.php            |  6 ++++--
 src/components/cards/CardBadges.vue    | 29 ++++++++++++++++++++++----
 tests/unit/Db/CardTest.php             |  3 +++
 tests/unit/Service/CardServiceTest.php |  2 +-
 6 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/css/icons.scss b/css/icons.scss
index c782f125d..6f2f35167 100644
--- a/css/icons.scss
+++ b/css/icons.scss
@@ -22,7 +22,9 @@
 .icon-activity {
 	@include icon-color('activity-dark', 'activity', $color-black);
 }
-
+.icon-comment--unread {
+	@include icon-color('comment', 'actions', $color-primary, 1, true);
+}
 
 .avatardiv.circles {
 	background: var(--color-primary);
diff --git a/lib/Db/Card.php b/lib/Db/Card.php
index 4168c7fe2..af2c665c5 100644
--- a/lib/Db/Card.php
+++ b/lib/Db/Card.php
@@ -49,6 +49,7 @@ class Card extends RelationalEntity {
 	protected $notified = false;
 	protected $deletedAt = 0;
 	protected $commentsUnread = 0;
+	protected $commentsCount = 0;
 	
 	protected $relatedStack = null;
 	protected $relatedBoard = null;
@@ -75,6 +76,7 @@ class Card extends RelationalEntity {
 		$this->addRelation('attachmentCount');
 		$this->addRelation('participants');
 		$this->addRelation('commentsUnread');
+		$this->addRelation('commentsCount');
 		$this->addResolvable('owner');
 		
 		$this->addRelation('relatedStack');
diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index 629185e21..0cb733c54 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -105,8 +105,10 @@ class CardService {
 		$card->setAttachmentCount($this->attachmentService->count($cardId));
 		$user = $this->userManager->get($this->currentUser);
 		$lastRead = $this->commentsManager->getReadMark('deckCard', (string)$card->getId(), $user);
-		$count = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId(), $lastRead);
-		$card->setCommentsUnread($count);
+		$countUnreadComments = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId(), $lastRead);
+		$countComments = $this->commentsManager->getNumberOfCommentsForObject('deckCard', (string)$card->getId());
+		$card->setCommentsUnread($countUnreadComments);
+		$card->setCommentsCount($countComments);
 		
 		$stack = $this->stackMapper->find($card->getStackId());
 		$board = $this->boardService->find($stack->getBoardId());
diff --git a/src/components/cards/CardBadges.vue b/src/components/cards/CardBadges.vue
index c77995f5f..5d046ec7f 100644
--- a/src/components/cards/CardBadges.vue
+++ b/src/components/cards/CardBadges.vue
@@ -22,7 +22,13 @@
 
 <template>
 	<div v-if="card" class="badges">
-		<div v-if="card.commentsUnread > 0" class="icon icon-comment" />
+		<div v-if="card.commentsCount > 0"
+			v-tooltip="commentsHint"
+			class="icon icon-comment"
+			:class="{ 'icon-comment--unread': card.commentsUnread > 0 }"
+			@click.stop="openComments">
+			{{ card.commentsCount }}
+		</div>
 
 		<div v-if="card.description && checkListCount > 0" class="card-tasks icon icon-checkmark">
 			{{ checkListCheckedCount }}/{{ checkListCount }}
@@ -58,6 +64,21 @@ export default {
 		checkListCheckedCount() {
 			return (this.card.description.match(/^\s*([*+-]|(\d\.))\s+\[\s*x\s*\](.*)$/gim) || []).length
 		},
+		commentsHint() {
+			if (this.card.commentsUnread > 0) {
+				return t('deck', '{count} comments, {unread} unread', {
+					count: this.card.commentsCount,
+					unread: this.card.commentsUnread
+				})
+			}
+			return null
+		},
+	},
+	methods: {
+		openComments() {
+			const boardId = this.card && this.card.boardId ? this.card.boardId : this.$route.params.id
+			this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id, tabId: 'comments' } })
+		},
 	},
 }
 </script>
@@ -70,7 +91,7 @@ export default {
 
 		.icon {
 			opacity: 0.5;
-			padding: 12px 18px;
+			padding: 10px 20px;
 			padding-right: 4px;
 			margin-right: 5px;
 			background-position: left;
@@ -78,8 +99,8 @@ export default {
 			span {
 				margin-left: 18px;
 			}
-			&.icon-edit {
-				opacity: 0.5;
+			&.icon-comment--unread {
+				opacity: 1;
 			}
 		}
 	}
diff --git a/tests/unit/Db/CardTest.php b/tests/unit/Db/CardTest.php
index 01f638a07..9465a53e4 100644
--- a/tests/unit/Db/CardTest.php
+++ b/tests/unit/Db/CardTest.php
@@ -83,6 +83,7 @@ class CardTest extends TestCase {
 			'assignedUsers' => null,
 			'deletedAt' => 0,
 			'commentsUnread' => 0,
+			'commentsCount' => 0,
 			'lastEditor' => null,
 			'ETag' => $card->getETag(),
 		], $card->jsonSerialize());
@@ -109,6 +110,7 @@ class CardTest extends TestCase {
 			'assignedUsers' => null,
 			'deletedAt' => 0,
 			'commentsUnread' => 0,
+			'commentsCount' => 0,
 			'lastEditor' => null,
 			'ETag' => $card->getETag(),
 		], $card->jsonSerialize());
@@ -145,6 +147,7 @@ class CardTest extends TestCase {
 			'assignedUsers' => ['user1'],
 			'deletedAt' => 0,
 			'commentsUnread' => 0,
+			'commentsCount' => 0,
 			'lastEditor' => null,
 			'ETag' => $card->getETag(),
 		], $card->jsonSerialize());
diff --git a/tests/unit/Service/CardServiceTest.php b/tests/unit/Service/CardServiceTest.php
index 3e351ac30..890c87f0d 100644
--- a/tests/unit/Service/CardServiceTest.php
+++ b/tests/unit/Service/CardServiceTest.php
@@ -128,7 +128,7 @@ class CardServiceTest extends TestCase {
 		$this->userManager->expects($this->once())
 			->method('get')
 			->willReturn($user);
-		$this->commentsManager->expects($this->once())
+		$this->commentsManager->expects($this->any())
 			->method('getNumberOfCommentsForObject')
 			->willReturn(0);
 		$boardMock = $this->createMock(Board::class);