Add dialog to display detailed votes
This commit is contained in:
parent
fa76ae64f8
commit
a5fdd41b03
2 changed files with 72 additions and 1 deletions
60
src/components/views/dialogs/PollResultsDialog.tsx
Normal file
60
src/components/views/dialogs/PollResultsDialog.tsx
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
/*
|
||||||
|
Copyright 2024 New Vector Ltd.
|
||||||
|
Copyright 2021, 2022 The Matrix.org Foundation C.I.C.
|
||||||
|
|
||||||
|
SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
|
||||||
|
Please see LICENSE files in the repository root for full details.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
|
||||||
|
import { RoomMember } from "matrix-js-sdk/src/matrix";
|
||||||
|
import React from "react";
|
||||||
|
|
||||||
|
import Modal from "../../../Modal";
|
||||||
|
import MemberAvatar from "../avatars/MemberAvatar";
|
||||||
|
import { UserVote } from "../messages/MPollBody";
|
||||||
|
import BaseDialog from "./BaseDialog";
|
||||||
|
|
||||||
|
interface IProps {
|
||||||
|
pollEvent: PollStartEvent;
|
||||||
|
votes: Map<string, UserVote[]>;
|
||||||
|
members: RoomMember[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function PollResultsDialog (props: IProps): JSX.Element {
|
||||||
|
return (
|
||||||
|
<BaseDialog
|
||||||
|
title={props.pollEvent.question.text}
|
||||||
|
onFinished={() => Modal.closeCurrentModal()}
|
||||||
|
>
|
||||||
|
{
|
||||||
|
props.pollEvent.answers.map((answer, answerIndex) => {
|
||||||
|
const votes = props.votes.get(answer.id) || [];
|
||||||
|
|
||||||
|
if(votes.length === 0) return;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div key={answer.id}>
|
||||||
|
<div style={{display: "flex", alignItems: "center", marginBottom: "10px"}}>
|
||||||
|
<span style={{fontWeight: "bolder", flexGrow: 1}}>{answer.text}</span>
|
||||||
|
<span>{votes.length} votes</span>
|
||||||
|
</div>
|
||||||
|
{votes.length === 0 && <div>No one voted for this.</div>}
|
||||||
|
{votes.map((vote) => {
|
||||||
|
const member = props.members.find(m => m.userId === vote.sender);
|
||||||
|
if (!member) return null;
|
||||||
|
return <div key={vote.sender} style={{display: "flex", alignItems: "center", marginLeft: "15px"}}>
|
||||||
|
<div style={{marginRight: "10px"}}>
|
||||||
|
<MemberAvatar member={member} size="36px" aria-hidden="true" />
|
||||||
|
</div>
|
||||||
|
{member.name}
|
||||||
|
</div>;
|
||||||
|
})}
|
||||||
|
{answerIndex < props.pollEvent.answers.length - 1 && <br />}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
</BaseDialog>
|
||||||
|
);
|
||||||
|
}
|
|
@ -29,6 +29,7 @@ import { MatrixClientPeg } from "../../../MatrixClientPeg";
|
||||||
import Modal from "../../../Modal";
|
import Modal from "../../../Modal";
|
||||||
import { formatList } from "../../../utils/FormattingUtils";
|
import { formatList } from "../../../utils/FormattingUtils";
|
||||||
import ErrorDialog from "../dialogs/ErrorDialog";
|
import ErrorDialog from "../dialogs/ErrorDialog";
|
||||||
|
import PollResultsDialog from "../dialogs/PollResultsDialog";
|
||||||
import PollCreateDialog from "../elements/PollCreateDialog";
|
import PollCreateDialog from "../elements/PollCreateDialog";
|
||||||
import Spinner from "../elements/Spinner";
|
import Spinner from "../elements/Spinner";
|
||||||
import { PollOption } from "../polls/PollOption";
|
import { PollOption } from "../polls/PollOption";
|
||||||
|
@ -324,6 +325,16 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
|
||||||
<span className="mx_MPollBody_edited"> ({_t("common|edited")})</span>
|
<span className="mx_MPollBody_edited"> ({_t("common|edited")})</span>
|
||||||
) : null;
|
) : null;
|
||||||
|
|
||||||
|
const showDetailedVotes = (): void => {
|
||||||
|
if(!showResults) return;
|
||||||
|
|
||||||
|
Modal.createDialog(PollResultsDialog, {
|
||||||
|
pollEvent,
|
||||||
|
votes,
|
||||||
|
members: this.context.getRoom(this.props.mxEvent.getRoomId())?.getJoinedMembers() ?? [],
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mx_MPollBody">
|
<div className="mx_MPollBody">
|
||||||
<h2 data-testid="pollQuestion">
|
<h2 data-testid="pollQuestion">
|
||||||
|
@ -357,7 +368,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
<div data-testid="totalVotes" className="mx_MPollBody_totalVotes">
|
<div data-testid="totalVotes" className="mx_MPollBody_totalVotes">
|
||||||
{totalText}
|
<span onClick={() => showDetailedVotes()}>{totalText}</span>
|
||||||
{isFetchingResponses && <Spinner w={16} h={16} />}
|
{isFetchingResponses && <Spinner w={16} h={16} />}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue