Merge branch 'public-polls' into 'develop'

Show 'public poll' label

See merge request soapbox-pub/soapbox-fe!1709
environments/review-develop-3zknud/deployments/709
marcin mikołajczak 2022-08-08 14:41:26 +00:00
commit afe421d5e3
2 zmienionych plików z 15 dodań i 1 usunięć

Wyświetl plik

@ -5,13 +5,14 @@ import { fetchPoll, vote } from 'soapbox/actions/polls';
import { useAppDispatch } from 'soapbox/hooks'; import { useAppDispatch } from 'soapbox/hooks';
import RelativeTimestamp from '../relative_timestamp'; import RelativeTimestamp from '../relative_timestamp';
import { Button, HStack, Stack, Text } from '../ui'; import { Button, HStack, Stack, Text, Tooltip } from '../ui';
import type { Selected } from './poll'; import type { Selected } from './poll';
import type { Poll as PollEntity } from 'soapbox/types/entities'; import type { Poll as PollEntity } from 'soapbox/types/entities';
const messages = defineMessages({ const messages = defineMessages({
closed: { id: 'poll.closed', defaultMessage: 'Closed' }, closed: { id: 'poll.closed', defaultMessage: 'Closed' },
nonAnonymous: { id: 'poll.non_anonymous.label', defaultMessage: 'Other instances may display the options you voted for' },
}); });
interface IPollFooter { interface IPollFooter {
@ -54,6 +55,18 @@ const PollFooter: React.FC<IPollFooter> = ({ poll, showResults, selected }): JSX
)} )}
<HStack space={1.5} alignItems='center'> <HStack space={1.5} alignItems='center'>
{poll.pleroma.get('non_anonymous') && (
<>
<Tooltip text={intl.formatMessage(messages.nonAnonymous)}>
<Text theme='muted' weight='medium'>
<FormattedMessage id='poll.non_anonymous' defaultMessage='Public poll' />
</Text>
</Tooltip>
<Text theme='muted'>&middot;</Text>
</>
)}
{showResults && ( {showResults && (
<> <>
<button className='text-gray-600 underline' onClick={handleRefresh} data-testid='poll-refresh'> <button className='text-gray-600 underline' onClick={handleRefresh} data-testid='poll-refresh'>

Wyświetl plik

@ -29,6 +29,7 @@ export const PollRecord = ImmutableRecord({
votes_count: 0, votes_count: 0,
own_votes: null as ImmutableList<number> | null, own_votes: null as ImmutableList<number> | null,
voted: false, voted: false,
pleroma: ImmutableMap<string, any>(),
}); });
// Sub-entity of Poll // Sub-entity of Poll