Commit 79d39356 authored by Shpuld Shpludson's avatar Shpuld Shpludson

Merge branch 'fix/not-all-polls-showing-up' into 'develop'

Fix: problems with polls state

See merge request pleroma/pleroma-fe!849
parents c2b48c32 947f69a9
......@@ -3,7 +3,7 @@ import { forEach, map } from 'lodash'
export default {
name: 'Poll',
props: ['pollId'],
props: ['basePoll'],
components: { Timeago },
data () {
return {
......@@ -11,13 +11,19 @@ export default {
choices: []
}
},
mounted () {
created () {
if (!this.$store.state.polls.pollsObject[this.pollId]) {
this.$store.dispatch('mergeOrAddPoll', this.basePoll)
}
this.$store.dispatch('trackPoll', this.pollId)
},
destroyed () {
this.$store.dispatch('untrackPoll', this.pollId)
},
computed: {
pollId () {
return this.basePoll.id
},
poll () {
const storePoll = this.$store.state.polls.pollsObject[this.pollId]
return storePoll || {}
......@@ -29,7 +35,7 @@ export default {
return (this.poll && this.poll.expires_at) || 0
},
expired () {
return Date.now() > Date.parse(this.expiresAt)
return (this.poll && this.poll.expired) || false
},
loggedIn () {
return this.$store.state.users.currentUser
......
......@@ -124,7 +124,7 @@
</div>
<div v-if="status.poll && status.poll.options">
<poll :poll-id="status.poll.id" />
<poll :base-poll="status.poll" />
</div>
<div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body">
......
import { each, merge } from 'lodash'
import { merge } from 'lodash'
import { set } from 'vue'
const polls = {
......@@ -8,15 +8,15 @@ const polls = {
pollsObject: {}
},
mutations: {
addNewStatuses (state, { statuses }) {
each(statuses, status => {
if (status.poll) {
set(state.pollsObject, status.poll.id, status.poll)
}
})
},
mergePoll (state, poll) {
state.pollsObject[poll.id] = merge(state.pollsObject[poll.id], poll)
mergeOrAddPoll (state, poll) {
const existingPoll = state.pollsObject[poll.id]
// Make expired-state change trigger re-renders properly
poll.expired = Date.now() > Date.parse(poll.expires_at)
if (existingPoll) {
set(state.pollsObject, poll.id, merge(existingPoll, poll))
} else {
set(state.pollsObject, poll.id, poll)
}
},
trackPoll (state, pollId) {
const currentValue = state.trackedPolls[pollId]
......@@ -36,11 +36,8 @@ const polls = {
}
},
actions: {
updatePoll ({ rootState, commit }, pollId) {
return rootState.api.backendInteractor.fetchPoll(pollId).then(poll => {
commit('mergePoll', poll)
return poll
})
mergeOrAddPoll ({ commit }, poll) {
commit('mergeOrAddPoll', poll)
},
updateTrackedPoll ({ rootState, dispatch, commit }, pollId) {
rootState.api.backendInteractor.fetchPoll(pollId).then(poll => {
......@@ -49,7 +46,7 @@ const polls = {
dispatch('updateTrackedPoll', pollId)
}
}, 30 * 1000)
commit('mergePoll', poll)
commit('mergeOrAddPoll', poll)
})
},
trackPoll ({ rootState, commit, dispatch }, pollId) {
......@@ -63,7 +60,7 @@ const polls = {
},
votePoll ({ rootState, commit }, { id, pollId, choices }) {
return rootState.api.backendInteractor.vote(pollId, choices).then(poll => {
commit('mergePoll', poll)
commit('mergeOrAddPoll', poll)
return poll
})
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment