From 31e799a02b6d605fa385955ab380c4f6db63f295 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 20 Mar 2021 22:34:48 +0100 Subject: [PATCH] Small society sorting adjustments (#4882) --- .../page-society/src/Overview/Defender.tsx | 7 ++-- packages/page-society/src/Overview/Member.tsx | 39 +++++++++++-------- .../page-society/src/Overview/Members.tsx | 3 +- .../page-society/src/Overview/Summary.tsx | 11 +++--- packages/page-society/src/Overview/Votes.tsx | 6 +-- .../src/Overview/VotesExpander.tsx | 4 +- packages/page-society/src/Suspended/index.tsx | 21 +++++----- packages/page-society/src/index.tsx | 28 +++++++------ packages/page-society/src/types.ts | 6 +-- packages/page-society/src/useMembers.ts | 2 +- packages/page-society/src/useVoters.ts | 2 +- 11 files changed, 68 insertions(+), 61 deletions(-) diff --git a/packages/page-society/src/Overview/Defender.tsx b/packages/page-society/src/Overview/Defender.tsx index fc91eed16e..29bc968fd0 100644 --- a/packages/page-society/src/Overview/Defender.tsx +++ b/packages/page-society/src/Overview/Defender.tsx @@ -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 | null { diff --git a/packages/page-society/src/Overview/Member.tsx b/packages/page-society/src/Overview/Member.tsx index 583f276669..26c48f84bf 100644 --- a/packages/page-society/src/Overview/Member.tsx +++ b/packages/page-society/src/Overview/Member.tsx @@ -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) => ( +

+ + + + + +

#{formatNumber(bn)}
+ + + +

+ )); +} + function Member ({ bestNumber, className = '', value: { isCandidateVoter, isFounder, isHead, isSkeptic, member: { accountId, isDefenderVoter, isSuspended, payouts, strikes } } }: Props): React.ReactElement { 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) => ( -

- - - - - -

#{formatNumber(bn)}
- - - -

- )), + () => bestNumber && payouts && renderJSXPayouts(bestNumber, payouts), [bestNumber, payouts] ); @@ -79,7 +84,7 @@ function Member ({ bestNumber, className = '', value: { isCandidateVoter, isFoun {isFounder && ( ('society founder')} + label={t('founder')} /> )} {isSkeptic && ( diff --git a/packages/page-society/src/Overview/Members.tsx b/packages/page-society/src/Overview/Members.tsx index b1dea8f0a2..fc597817d6 100644 --- a/packages/page-society/src/Overview/Members.tsx +++ b/packages/page-society/src/Overview/Members.tsx @@ -21,8 +21,7 @@ function Members ({ className = '', mapMembers }: Props): React.ReactElement { const members = useCall(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 ( diff --git a/packages/page-society/src/Overview/Votes.tsx b/packages/page-society/src/Overview/Votes.tsx index 92e10320be..ed78c00775 100644 --- a/packages/page-society/src/Overview/Votes.tsx +++ b/packages/page-society/src/Overview/Votes.tsx @@ -18,9 +18,9 @@ function Votes ({ votes }: Props): React.ReactElement { 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]); diff --git a/packages/page-society/src/Overview/VotesExpander.tsx b/packages/page-society/src/Overview/VotesExpander.tsx index e1a14d8515..5b4300b538 100644 --- a/packages/page-society/src/Overview/VotesExpander.tsx +++ b/packages/page-society/src/Overview/VotesExpander.tsx @@ -19,12 +19,12 @@ function VotesExpander ({ label, votes }: Props): React.ReactElement | nu return ( - {votes.map(([who]): React.ReactNode => + {votes.map(([who]): React.ReactNode => ( - )} + ))} ); } diff --git a/packages/page-society/src/Suspended/index.tsx b/packages/page-society/src/Suspended/index.tsx index 78c0a2a920..1c88947de9 100644 --- a/packages/page-society/src/Suspended/index.tsx +++ b/packages/page-society/src/Suspended/index.tsx @@ -29,22 +29,21 @@ function Suspended ({ className }: Props): React.ReactElement { const candidates = useCall(api.query.society.suspendedCandidates.keys, undefined, optExtract); const members = useCall(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 (
('No suspended members')} - header={headerRefM.current} + header={headerRef.current.members} > {members && members.map((accountId): React.ReactNode => ( {
('No suspended candidates')} - header={headerRefC.current} + header={headerRef.current.candidates} > {candidates && candidates.map((accountId): React.ReactNode => ( 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 const { candidates, skeptics, voters } = useVoters(); const mapMembers = useMemo( - () => members && info + () => members && info && skeptics && voters ? getMapMembers(members, skeptics, voters, info) : undefined, [info, members, skeptics, voters] diff --git a/packages/page-society/src/types.ts b/packages/page-society/src/types.ts index 304675dec8..37328f60f1 100644 --- a/packages/page-society/src/types.ts +++ b/packages/page-society/src/types.ts @@ -28,7 +28,7 @@ export interface VoteSplit { } export interface Voters { - candidates: DeriveSocietyCandidate[]; - skeptics: string[]; - voters: string[]; + candidates?: DeriveSocietyCandidate[]; + skeptics?: string[]; + voters?: string[]; } diff --git a/packages/page-society/src/useMembers.ts b/packages/page-society/src/useMembers.ts index e56fe401ee..b9863a3fae 100644 --- a/packages/page-society/src/useMembers.ts +++ b/packages/page-society/src/useMembers.ts @@ -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)); diff --git a/packages/page-society/src/useVoters.ts b/packages/page-society/src/useVoters.ts index 1890581ffb..e046ffcf75 100644 --- a/packages/page-society/src/useVoters.ts +++ b/packages/page-society/src/useVoters.ts @@ -40,7 +40,7 @@ export default function useVoters (): Voters { const { api } = useApi(); const voteTrigger = useEventTrigger([api.events.society.Vote]); const candidates = useCall(api.derive.society.candidates); - const [state, setState] = useState(EMPTY); + const [state, setState] = useState({}); useEffect((): void => { voteTrigger && candidates && (