Small society sorting adjustments (#4882)
This commit is contained in:
parent
b1aefd7c59
commit
31e799a02b
@ -22,11 +22,10 @@ interface Props {
|
||||
}
|
||||
|
||||
const transformVotes = {
|
||||
transform: (members: DeriveSocietyMember[]): VoteType[] => {
|
||||
return members
|
||||
transform: (members: DeriveSocietyMember[]): VoteType[] =>
|
||||
members
|
||||
.filter(({ vote }): boolean => !!vote)
|
||||
.map(({ accountId, vote }): VoteType => [accountId.toString(), vote as SocietyVote]);
|
||||
}
|
||||
.map(({ accountId, vote }): VoteType => [accountId.toString(), vote as SocietyVote])
|
||||
};
|
||||
|
||||
function Defender ({ className = '', info, isMember, ownMembers }: Props): React.ReactElement<Props> | null {
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
import type BN from 'bn.js';
|
||||
import type { Balance, BlockNumber } from '@polkadot/types/interfaces';
|
||||
import type { MapMember } from '../types';
|
||||
|
||||
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
||||
@ -27,6 +28,25 @@ const CANVAS_STYLE = {
|
||||
margin: '0 auto'
|
||||
};
|
||||
|
||||
function renderJSXPayouts (bestNumber: BN, payouts: [BlockNumber, Balance][]): JSX.Element[] {
|
||||
return payouts.map(([bn, value], index) => (
|
||||
<p key={index}>
|
||||
<Columar>
|
||||
<Columar.Column>
|
||||
<FormatBalance value={value} />
|
||||
</Columar.Column>
|
||||
<Columar.Column>
|
||||
<div>#{formatNumber(bn)}</div>
|
||||
<BlockToTime
|
||||
key={index}
|
||||
value={bn.sub(bestNumber)}
|
||||
/>
|
||||
</Columar.Column>
|
||||
</Columar>
|
||||
</p>
|
||||
));
|
||||
}
|
||||
|
||||
function Member ({ bestNumber, className = '', value: { isCandidateVoter, isFounder, isHead, isSkeptic, member: { accountId, isDefenderVoter, isSuspended, payouts, strikes } } }: Props): React.ReactElement<Props> {
|
||||
const { t } = useTranslation();
|
||||
const { api } = useApi();
|
||||
@ -35,22 +55,7 @@ function Member ({ bestNumber, className = '', value: { isCandidateVoter, isFoun
|
||||
const [isInkShowing, toggleInk] = useToggle();
|
||||
|
||||
const renderPayouts = useCallback(
|
||||
() => bestNumber && payouts?.map(([bn, value], index) => (
|
||||
<p key={index}>
|
||||
<Columar>
|
||||
<Columar.Column>
|
||||
<FormatBalance value={value} />
|
||||
</Columar.Column>
|
||||
<Columar.Column>
|
||||
<div>#{formatNumber(bn)}</div>
|
||||
<BlockToTime
|
||||
key={index}
|
||||
value={bn.sub(bestNumber)}
|
||||
/>
|
||||
</Columar.Column>
|
||||
</Columar>
|
||||
</p>
|
||||
)),
|
||||
() => bestNumber && payouts && renderJSXPayouts(bestNumber, payouts),
|
||||
[bestNumber, payouts]
|
||||
);
|
||||
|
||||
@ -79,7 +84,7 @@ function Member ({ bestNumber, className = '', value: { isCandidateVoter, isFoun
|
||||
{isFounder && (
|
||||
<Tag
|
||||
color='green'
|
||||
label={t<string>('society founder')}
|
||||
label={t<string>('founder')}
|
||||
/>
|
||||
)}
|
||||
{isSkeptic && (
|
||||
|
||||
@ -21,8 +21,7 @@ function Members ({ className = '', mapMembers }: Props): React.ReactElement<Pro
|
||||
const bestNumber = useBestNumber();
|
||||
|
||||
const headerRef = useRef([
|
||||
[t('members'), 'start', 2],
|
||||
[],
|
||||
[t('members'), 'start', 3],
|
||||
[t('strikes')],
|
||||
[]
|
||||
]);
|
||||
|
||||
@ -24,11 +24,12 @@ function Summary ({ className = '', info }: Props): React.ReactElement<Props> {
|
||||
const members = useCall<unknown[]>(api.derive.society.members);
|
||||
const bestNumber = useBestNumber();
|
||||
|
||||
const pot = useMemo((): string | null => {
|
||||
return info && info.pot.gtn(0)
|
||||
? info.pot.toString()
|
||||
: null;
|
||||
}, [info]);
|
||||
const pot = useMemo(
|
||||
() => info && info.pot.gtn(0)
|
||||
? info.pot
|
||||
: null,
|
||||
[info]
|
||||
);
|
||||
|
||||
return (
|
||||
<SummaryBox className={className}>
|
||||
|
||||
@ -18,9 +18,9 @@ function Votes ({ votes }: Props): React.ReactElement<Props> {
|
||||
|
||||
useEffect((): void => {
|
||||
votes && setVoteSplit({
|
||||
allAye: votes.filter(([, vote]): boolean => vote.isApprove),
|
||||
allNay: votes.filter(([, vote]): boolean => vote.isReject),
|
||||
allSkeptic: votes.filter(([, vote]): boolean => vote.isSkeptic)
|
||||
allAye: votes.filter(([, vote]) => vote.isApprove),
|
||||
allNay: votes.filter(([, vote]) => vote.isReject),
|
||||
allSkeptic: votes.filter(([, vote]) => vote.isSkeptic)
|
||||
});
|
||||
}, [votes]);
|
||||
|
||||
|
||||
@ -19,12 +19,12 @@ function VotesExpander ({ label, votes }: Props): React.ReactElement<Props> | nu
|
||||
|
||||
return (
|
||||
<Expander summary={`${label} (${votes.length})`}>
|
||||
{votes.map(([who]): React.ReactNode =>
|
||||
{votes.map(([who]): React.ReactNode => (
|
||||
<AddressMini
|
||||
key={who.toString()}
|
||||
value={who}
|
||||
/>
|
||||
)}
|
||||
))}
|
||||
</Expander>
|
||||
);
|
||||
}
|
||||
|
||||
@ -29,22 +29,21 @@ function Suspended ({ className }: Props): React.ReactElement<Props> {
|
||||
const candidates = useCall<AccountId[]>(api.query.society.suspendedCandidates.keys, undefined, optExtract);
|
||||
const members = useCall<AccountId[]>(api.query.society.suspendedMembers.keys, undefined, optExtract);
|
||||
|
||||
const headerRefC = useRef([
|
||||
[t('candidates'), 'start']
|
||||
]);
|
||||
|
||||
const headerRefM = useRef([
|
||||
[t('members'), 'start']
|
||||
]);
|
||||
|
||||
console.log(JSON.stringify({ candidates, members }, null, 2));
|
||||
const headerRef = useRef({
|
||||
candidates: [
|
||||
[t('candidates'), 'start']
|
||||
],
|
||||
members: [
|
||||
[t('members'), 'start']
|
||||
]
|
||||
});
|
||||
|
||||
return (
|
||||
<div className={className}>
|
||||
<Table
|
||||
className={className}
|
||||
empty={members && t<string>('No suspended members')}
|
||||
header={headerRefM.current}
|
||||
header={headerRef.current.members}
|
||||
>
|
||||
{members && members.map((accountId): React.ReactNode => (
|
||||
<Suspension
|
||||
@ -56,7 +55,7 @@ function Suspended ({ className }: Props): React.ReactElement<Props> {
|
||||
<Table
|
||||
className={className}
|
||||
empty={candidates && t<string>('No suspended candidates')}
|
||||
header={headerRefC.current}
|
||||
header={headerRef.current.candidates}
|
||||
>
|
||||
{candidates && candidates.map((accountId): React.ReactNode => (
|
||||
<Suspension
|
||||
|
||||
@ -36,24 +36,28 @@ function getMapMembers (members: DeriveSocietyMember[], skeptics: string[], vote
|
||||
key: member.accountId.toString(),
|
||||
member
|
||||
}))
|
||||
.sort((a, b) => b.member.payouts.length - a.member.payouts.length)
|
||||
.sort((a, b) =>
|
||||
b.isCandidateVoter || b.member.isDefenderVoter
|
||||
? 1
|
||||
: a.isCandidateVoter || a.member.isDefenderVoter
|
||||
? -1
|
||||
: 0
|
||||
)
|
||||
.sort((a, b) =>
|
||||
a.isHead
|
||||
? -1
|
||||
: b.isHead
|
||||
? 1
|
||||
: a.isSkeptic
|
||||
: a.isFounder
|
||||
? -1
|
||||
: b.isSkeptic
|
||||
: b.isFounder
|
||||
? 1
|
||||
: a.isCandidateVoter || a.member.isDefenderVoter
|
||||
? -1
|
||||
: b.isCandidateVoter || b.member.isDefenderVoter
|
||||
? 1
|
||||
: a.isFounder
|
||||
? 1
|
||||
: b.isFounder
|
||||
? -1
|
||||
: 0
|
||||
: b.isSkeptic
|
||||
? 1
|
||||
: a.isSkeptic
|
||||
? -1
|
||||
: 0
|
||||
);
|
||||
}
|
||||
|
||||
@ -67,7 +71,7 @@ function SocietyApp ({ basePath, className }: Props): React.ReactElement<Props>
|
||||
const { candidates, skeptics, voters } = useVoters();
|
||||
|
||||
const mapMembers = useMemo(
|
||||
() => members && info
|
||||
() => members && info && skeptics && voters
|
||||
? getMapMembers(members, skeptics, voters, info)
|
||||
: undefined,
|
||||
[info, members, skeptics, voters]
|
||||
|
||||
@ -28,7 +28,7 @@ export interface VoteSplit {
|
||||
}
|
||||
|
||||
export interface Voters {
|
||||
candidates: DeriveSocietyCandidate[];
|
||||
skeptics: string[];
|
||||
voters: string[];
|
||||
candidates?: DeriveSocietyCandidate[];
|
||||
skeptics?: string[];
|
||||
voters?: string[];
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ import { useAccounts, useApi, useCall } from '@polkadot/react-hooks';
|
||||
function transform (allAccounts: string[], members: DeriveSocietyMember[]): OwnMembers {
|
||||
const allMembers = members
|
||||
.filter((member) => !member.isSuspended)
|
||||
.map((member): string => member.accountId.toString());
|
||||
.map(({ accountId }) => accountId.toString());
|
||||
const ownMembers = allMembers
|
||||
.filter((address) => allAccounts.includes(address));
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ export default function useVoters (): Voters {
|
||||
const { api } = useApi();
|
||||
const voteTrigger = useEventTrigger([api.events.society.Vote]);
|
||||
const candidates = useCall<DeriveSocietyCandidate[]>(api.derive.society.candidates);
|
||||
const [state, setState] = useState<Voters>(EMPTY);
|
||||
const [state, setState] = useState<Voters>({});
|
||||
|
||||
useEffect((): void => {
|
||||
voteTrigger && candidates && (
|
||||
|
||||
Loading…
Reference in New Issue
Block a user