Skip to content

Show polls in own section of shared items #7922

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

Merged
marcoambrosini merged 1 commit into from
Sep 15, 2022
Merged

Show polls in own section of shared items #7922

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
26 changes: 22 additions & 4 deletions src/components/RightSidebar/SharedItems/SharedItems.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,18 @@
<div v-else-if="type === 'deckcard'"
:key="item.id"
class="shared-items__deckcard"
:class="{ 'shared-items__location--nolimit': limit === 0 }">
:class="{ 'shared-items__deckcard--nolimit': limit === 0 }">
<DeckCard :wide="true"
v-bind="item.messageParameters.object" />
</div>
<div v-else-if="type === 'poll'"
:key="item.id"
class="shared-items__poll"
:class="{ 'shared-items__poll--nolimit': limit === 0 }">
<Poll v-bind="item.messageParameters.object"
:token="$store.getters.getToken()"
:poll-name="item.messageParameters.object.name" />
</div>
<template v-else-if="type === 'other'">
<div :key="item.id"
class="shared-items__other">
Expand All @@ -60,18 +68,20 @@
</template>

<script>
import DeckCard from '../../MessagesList/MessagesGroup/Message/MessagePart/DeckCard.vue'
import FilePreview from '../../MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
import { SHARED_ITEM } from '../../../constants.js'
import Location from '../../MessagesList/MessagesGroup/Message/MessagePart/Location.vue'
import DeckCard from '../../MessagesList/MessagesGroup/Message/MessagePart/DeckCard.vue'
import Poll from '../../MessagesList/MessagesGroup/Message/MessagePart/Poll.vue'
import { SHARED_ITEM } from '../../../constants.js'

export default {
name: 'SharedItems',

components: {
DeckCard,
FilePreview,
Location,
DeckCard,
Poll,
},

props: {
Expand Down Expand Up @@ -119,10 +129,12 @@ export default {
grid-template-rows: 1fr 1fr;
grid-gap: 4px;
margin: auto;

&__list {
display: flex;
flex-wrap: wrap;
}

&__location {
width: 100%;
height: 150px;
Expand All @@ -132,8 +144,14 @@ export default {
width: 33%;
}
}

&__poll,
&__deckcard {
width: 100%;

&--nolimit {
width: 33%;
}
}

&__other {
Expand Down
10 changes: 6 additions & 4 deletions src/components/RightSidebar/SharedItems/SharedItemsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<SharedItems :type="type"
:limit="limit(type)"
:items="sharedItems[type]" />
<NcButton v-if="hasMore(sharedItems[type])"
<NcButton v-if="hasMore(type, sharedItems[type])"
type="tertiary-no-background"
class="more"
:wide="true"
Expand Down Expand Up @@ -146,8 +146,8 @@ export default {
this.$store.dispatch('getSharedItemsOverview', { token: this.token })
},

hasMore(items) {
return Object.values(items).length > 6
hasMore(type, items) {
return Object.values(items).length > this.limit(type)
},

showMore(type) {
Expand All @@ -156,7 +156,7 @@ export default {
},

limit(type) {
if (type === SHARED_ITEM.TYPES.DECK_CARD || type === SHARED_ITEM.TYPES.LOCATION) {
if (type === SHARED_ITEM.TYPES.DECK_CARD || type === SHARED_ITEM.TYPES.LOCATION || type === SHARED_ITEM.TYPES.POLL) {
return 2
} else {
return 6
Expand All @@ -169,6 +169,8 @@ export default {
return t('spreed', 'Show all media')
case SHARED_ITEM.TYPES.FILE:
return t('spreed', 'Show all files')
case SHARED_ITEM.TYPES.POLL:
return t('spreed', 'Show all polls')
case SHARED_ITEM.TYPES.DECK_CARD:
return t('spreed', 'Show all deck cards')
case SHARED_ITEM.TYPES.VOICE:
Expand Down
1 change: 1 addition & 0 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export const SHARED_ITEM = {
LOCATION: 'location',
MEDIA: 'media',
OTHER: 'other',
POLL: 'poll',
VOICE: 'voice',
},
}
Expand Down
4 changes: 3 additions & 1 deletion src/mixins/sharedItems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const sharedItems = {
computed: {
// Defines the order of the sections
sharedItemsOrder() {
return [SHARED_ITEM.TYPES.MEDIA, SHARED_ITEM.TYPES.FILE, SHARED_ITEM.TYPES.VOICE, SHARED_ITEM.TYPES.AUDIO, SHARED_ITEM.TYPES.LOCATION, SHARED_ITEM.TYPES.DECK_CARD, SHARED_ITEM.TYPES.OTHER]
return [SHARED_ITEM.TYPES.MEDIA, SHARED_ITEM.TYPES.FILE, SHARED_ITEM.TYPES.POLL, SHARED_ITEM.TYPES.VOICE, SHARED_ITEM.TYPES.AUDIO, SHARED_ITEM.TYPES.LOCATION, SHARED_ITEM.TYPES.DECK_CARD, SHARED_ITEM.TYPES.OTHER]
},
},

Expand All @@ -37,6 +37,8 @@ const sharedItems = {
return t('spreed', 'Media')
case SHARED_ITEM.TYPES.FILE:
return t('spreed', 'Files')
case SHARED_ITEM.TYPES.POLL:
return t('spreed', 'Polls')
case SHARED_ITEM.TYPES.DECK_CARD:
return t('spreed', 'Deck cards')
case SHARED_ITEM.TYPES.VOICE:
Expand Down
2 changes: 2 additions & 0 deletions src/store/sharedItemsStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const getItemTypeFromMessage = function(message) {
return SHARED_ITEM.TYPES.LOCATION
} else if (message.messageParameters.object.type === 'deck-card') {
return SHARED_ITEM.TYPES.DECK_CARD
} else if (message.messageParameters.object.type === 'talk-poll') {
return SHARED_ITEM.TYPES.POLL
} else {
return SHARED_ITEM.TYPES.OTHER
}
Expand Down