Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: poll ranked choice voter expansion should append additional voters (#28432) 

Currently, for Ranked Choice results and voter list expansion, the code is replacing the voter list with the newly fetched page of voters instead of appending to the existing voter list. This is resolved in this PR and brings it in line with regular polls.

See: https://meta.discourse.org/t/ranked-choice-poll-does-not-reflect-change-of-votes-in-outcome/321227/18
This commit is contained in:
Robert 2024-11-05 01:28:32 +00:00 committed by GitHub
parent bba9a99e2e
commit 40a4d55c77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
plugins/poll/assets/javascripts/discourse/components/poll.gjs
View File

@ -468,19 +468,18 @@ export default class PollComponent extends Component {
@action
fetchVoters(optionId) {
let votersCount;
let voters;
let preloadedVoters = this.preloadedVoters;
Object.keys(preloadedVoters).forEach((key) => {
if (key === optionId) {
preloadedVoters[key].loading = true;
}
});
if (optionId) {
preloadedVoters[optionId].loading = true;
voters = preloadedVoters[optionId]?.voters;
} else {
voters = preloadedVoters;
}
this.preloadedVoters = Object.assign(preloadedVoters);
votersCount = this.options.find((option) => option.id === optionId).voters
.length;
this.preloadedVoters = Object.assign({}, preloadedVoters);
const votersCount = voters?.length;
return ajax("/polls/voters.json", {
data: {
@ -493,14 +492,19 @@ export default class PollComponent extends Component {
})
.then((result) => {
this.voterListExpanded = true;
const voters = optionId
? this.preloadedVoters[optionId].voters
: this.preloadedVoters;
const newVoters = optionId ? result.voters[optionId] : result.voters;
let votersSet = new Set([]);
if (this.isRankedChoice) {
this.preloadedVoters[optionId].voters = [...new Set([...newVoters])];
votersSet = new Set(voters.map((voter) => voter.user.username));
newVoters.forEach((voter) => {
if (!votersSet.has(voter.user.username)) {
votersSet.add(voter.user.username);
voters.push(voter);
}
});
} else {
const votersSet = new Set(voters.map((voter) => voter.username));
votersSet = new Set(voters.map((voter) => voter.username));
newVoters.forEach((voter) => {
if (!votersSet.has(voter.username)) {
votersSet.add(voter.username);
@ -509,12 +513,11 @@ export default class PollComponent extends Component {
});
// remove users who changed their vote
if (this.poll.type === REGULAR) {
Object.keys(this.preloadedVoters).forEach((otherOptionId) => {
Object.keys(preloadedVoters).forEach((otherOptionId) => {
if (optionId !== otherOptionId) {
this.preloadedVoters[otherOptionId].voters =
this.preloadedVoters[otherOptionId].voters.filter(
(voter) => !votersSet.has(voter.username)
);
preloadedVoters[otherOptionId].voters = preloadedVoters[
otherOptionId
].voters.filter((voter) => !votersSet.has(voter.username));
}
});
}
@ -528,9 +531,10 @@ export default class PollComponent extends Component {
}
})
.finally(() => {
preloadedVoters = this.preloadedVoters;
preloadedVoters[optionId].loading = false;
this.preloadedVoters = Object.assign(preloadedVoters);
if (optionId) {
preloadedVoters[optionId].loading = false;
}
this.preloadedVoters = Object.assign({}, preloadedVoters);
});
}

18
plugins/poll/test/javascripts/acceptance/poll-results-test.js
View File

@ -979,14 +979,6 @@ acceptance("Poll results", function (needs) {
return helper.response({
voters: {
db753fe0bc4e72869ac1ad8765341764: [
{
id: 1,
username: "bianca",
name: null,
avatar_template:
"/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
title: null,
},
{
id: 7,
username: "foo",
@ -1004,16 +996,6 @@ acceptance("Poll results", function (needs) {
return helper.response({
voters: {
def034c6770c6fd3754c054ef9ec4721: [
{
rank: 1,
user: {
id: 1,
username: "bianca",
name: null,
avatar_template:
"/letter_avatar_proxy/v4/letter/b/3be4f8/{size}.png",
},
},
{
rank: 1,
user: {