Skip to content

feat(card): show comments within the Details tab #8039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SadeqRouhani wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −18
Open

feat(card): show comments within the Details tab #8039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions src/components/card/CardSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,9 @@
<CardSidebarTabAttachments :card="currentCard" />
</NcAppSidebarTab>

<NcAppSidebarTab id="comments"
:order="2"
:name="t('deck', 'Comments')">
<template #icon>
<CommentIcon v-if="activeTabId === 'comments'" :size="20" />
<CommentOutlineIcon v-else :size="20" />
</template>
<CardSidebarTabComments :card="currentCard" :tab-query="tabQuery" />
</NcAppSidebarTab>

<NcAppSidebarTab v-if="hasActivity"
id="timeline"
:order="3"
:order="2"
:name="t('deck', 'Activity')">
<template #icon>
<ActivityIcon :size="20" />
Expand All @@ -87,15 +77,12 @@ import { getCapabilities } from '@nextcloud/capabilities'
import { mapState, mapGetters } from 'vuex'
import CardSidebarTabDetails from './CardSidebarTabDetails.vue'
import CardSidebarTabAttachments from './CardSidebarTabAttachments.vue'
import CardSidebarTabComments from './CardSidebarTabComments.vue'
import CardSidebarTabActivity from './CardSidebarTabActivity.vue'
import relativeDate from '../../mixins/relativeDate.js'
import moment from '@nextcloud/moment'
import AttachmentIcon from 'vue-material-design-icons/Paperclip.vue'
import HomeIcon from 'vue-material-design-icons/Home.vue'
import HomeOutlineIcon from 'vue-material-design-icons/HomeOutline.vue'
import CommentIcon from 'vue-material-design-icons/Comment.vue'
import CommentOutlineIcon from 'vue-material-design-icons/CommentOutline.vue'
import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'

import { showError, showWarning } from '@nextcloud/dialogs'
Expand All @@ -112,13 +99,10 @@ export default {
NcActionButton,
NcReferenceList,
CardSidebarTabAttachments,
CardSidebarTabComments,
CardSidebarTabActivity,
CardSidebarTabDetails,
ActivityIcon,
AttachmentIcon,
CommentIcon,
CommentOutlineIcon,
HomeIcon,
HomeOutlineIcon,
CardMenuEntries,
Expand Down
17 changes: 17 additions & 0 deletions src/components/card/CardSidebarTabDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
:can-edit="canEdit"
show-attachments
@change="descriptionChanged" />

<div class="comments-section">
<h5>{{ t('deck', 'Comments') }}</h5>
<CardSidebarTabComments :card="card" />
</div>
</div>
</template>

Expand All @@ -65,6 +70,7 @@ import DueDateSelector from './DueDateSelector.vue'
import StartDateSelector from './StartDateSelector.vue'
import { debounce } from 'lodash'
import DependentCardsSelector from './DependentCardsSelector.vue'
import CardSidebarTabComments from './CardSidebarTabComments.vue'

export default {
name: 'CardSidebarTabDetails',
Expand All @@ -75,6 +81,7 @@ export default {
AssignmentSelector,
TagSelector,
Description,
CardSidebarTabComments,
NcCollectionList,
},
mixins: [Color],
Expand Down Expand Up @@ -253,6 +260,16 @@ export default {
}
</script>
<style lang="scss" scoped>
.comments-section {
margin-top: 20px;

h5 {
border-bottom: 1px solid var(--color-border);
color: var(--color-text-maxcontrast);
margin-bottom: 10px;
}
}

.section-wrapper {
display: flex;
max-width: 100%;
Expand Down
2 changes: 1 addition & 1 deletion src/components/cards/CardBadges.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default {
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' } })
this.$router.push({ name: 'card', params: { id: boardId, cardId: this.card.id, tabId: 'details' } })
},
},
}
Expand Down