From 7c8c27f5e031658bc20fbe0b9a1a9e5f84ea4015 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 3 Dec 2020 09:40:50 +0100 Subject: [PATCH] Store network apiUrl affinity (#4147) * Store network apiUrl affinity * Fix setting of url * Remove old affinities (when networks swap) --- packages/apps/src/Endpoints/Group.tsx | 4 +++- packages/apps/src/Endpoints/Network.tsx | 25 +++++++++++++------ packages/apps/src/Endpoints/index.tsx | 32 ++++++++++++++++++++++++- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/packages/apps/src/Endpoints/Group.tsx b/packages/apps/src/Endpoints/Group.tsx index 4b4ac8a8d4..283c6073c0 100644 --- a/packages/apps/src/Endpoints/Group.tsx +++ b/packages/apps/src/Endpoints/Group.tsx @@ -11,6 +11,7 @@ import type { Group } from './types'; import Network from './Network'; interface Props { + affinities: Record; apiUrl: string; children?: React.ReactNode; className?: string; @@ -21,7 +22,7 @@ interface Props { value: Group; } -function GroupDisplay ({ apiUrl, children, className = '', index, isSelected, setApiUrl, setGroup, value: { header, networks } }: Props): React.ReactElement { +function GroupDisplay ({ affinities, apiUrl, children, className = '', index, isSelected, setApiUrl, setGroup, value: { header, networks } }: Props): React.ReactElement { const _setGroup = useCallback( () => setGroup(isSelected ? -1 : index), [index, isSelected, setGroup] @@ -41,6 +42,7 @@ function GroupDisplay ({ apiUrl, children, className = '', index, isSelected, se
{networks.map((network, index): React.ReactNode => ( void; + setApiUrl: (network: string, apiUrl: string) => void; value: Network; } -function NetworkDisplay ({ apiUrl, className = '', setApiUrl, value: { icon, isChild, name, providers } }: Props): React.ReactElement { +function NetworkDisplay ({ affinity, apiUrl, className = '', setApiUrl, value: { icon, isChild, name, providers } }: Props): React.ReactElement { const isSelected = useMemo( () => providers.some(({ url }) => url === apiUrl), [apiUrl, providers] ); - const _selectFirst = useCallback( - () => setApiUrl(providers[0].url), - [providers, setApiUrl] + const _selectUrl = useCallback( + () => setApiUrl( + name, + affinity && providers.find(({ url }) => url === affinity) + ? affinity + : providers[0].url + ), + [affinity, name, providers, setApiUrl] + ); + + const _setApiUrl = useCallback( + (apiUrl: string) => setApiUrl(name, apiUrl), + [name, setApiUrl] ); return (
))} diff --git a/packages/apps/src/Endpoints/index.tsx b/packages/apps/src/Endpoints/index.tsx index 259a1c08c8..a606e5bb5a 100644 --- a/packages/apps/src/Endpoints/index.tsx +++ b/packages/apps/src/Endpoints/index.tsx @@ -5,6 +5,7 @@ /* eslint-disable-next-line node/no-deprecated-api */ import punycode from 'punycode'; import React, { useCallback, useMemo, useState } from 'react'; +import store from 'store'; import styled from 'styled-components'; import type { LinkOption } from '@polkadot/apps-config/settings/types'; @@ -31,6 +32,8 @@ interface UrlState { isUrlValid: boolean; } +const STORAGE_AFFINITIES = 'network:affinities'; + function isValidUrl (url: string): boolean { return ( // some random length... we probably want to parse via some lib @@ -98,12 +101,29 @@ function extractUrlState (apiUrl: string, groups: Group[]): UrlState { }; } +function loadAffinities (groups: Group[]): Record { + return Object + .entries(store.get(STORAGE_AFFINITIES) || {}) + .filter(([network, apiUrl]) => + groups.some(({ networks }) => + networks.some(({ name, providers }) => + name === network && providers.some(({ url }) => url === apiUrl) + ) + ) + ) + .reduce((result: Record, [network, apiUrl]): Record => ({ + ...result, + [network]: apiUrl + }), {}); +} + function Endpoints ({ className = '', offset, onClose }: Props): React.ReactElement { const { t } = useTranslation(); const linkOptions = createWsEndpoints(t); const [groups, setGroups] = useState(combineEndpoints(linkOptions)); const [{ apiUrl, groupIndex, hasUrlChanged, isUrlValid }, setApiUrl] = useState(extractUrlState(uiSettings.get().apiUrl, groups)); const [storedCustomEndpoints, setStoredCustomEndpoints] = useState(getCustomEndpoints()); + const [affinities, setAffinities] = useState(loadAffinities(groups)); const isKnownUrl = useMemo(() => { let result = false; @@ -168,7 +188,16 @@ function Endpoints ({ className = '', offset, onClose }: Props): React.ReactElem }; const _setApiUrl = useCallback( - (apiUrl: string) => setApiUrl(extractUrlState(apiUrl, groups)), + (network: string, apiUrl: string): void => { + setAffinities((affinities): Record => { + const newValue = { ...affinities, [network]: apiUrl }; + + store.set(STORAGE_AFFINITIES, newValue); + + return newValue; + }); + setApiUrl(extractUrlState(apiUrl, groups)); + }, [groups] ); @@ -212,6 +241,7 @@ function Endpoints ({ className = '', offset, onClose }: Props): React.ReactElem > {groups.map((group, index): React.ReactNode => (