feat: add bee-desktop settings capabilities (#323)
* refactor: make the config readonly and extract endpoint calls to hook (+2 squashed commits) Squashed commits: [91ffe45] feat: add swap-endpoint [e1d0c3a] feat: add bee-desktop settings capabilities * feat: use the request mechanism that uses the bee-desktop API key * fix: properly reset the error or on error set the config to null
This commit is contained in:
@@ -55,7 +55,7 @@ interface Props {
|
|||||||
confirmLabelDisabled?: boolean
|
confirmLabelDisabled?: boolean
|
||||||
loading?: boolean
|
loading?: boolean
|
||||||
onChange?: (value: string) => void
|
onChange?: (value: string) => void
|
||||||
onConfirm: (value: string) => void
|
onConfirm?: (value: string) => void
|
||||||
mapperFn?: (value: string) => string
|
mapperFn?: (value: string) => string
|
||||||
locked?: boolean
|
locked?: boolean
|
||||||
}
|
}
|
||||||
@@ -138,7 +138,9 @@ export default function ExpandableListItemKey({
|
|||||||
}
|
}
|
||||||
loading={loading}
|
loading={loading}
|
||||||
iconType={Search}
|
iconType={Search}
|
||||||
onClick={() => onConfirm(inputValue)}
|
onClick={() => {
|
||||||
|
if (onConfirm) onConfirm(inputValue)
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{confirmLabel || 'Save'}
|
{confirmLabel || 'Save'}
|
||||||
</SwarmButton>
|
</SwarmButton>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { config } from '../config'
|
import { config } from '../config'
|
||||||
|
import { getJson } from '../utils/net'
|
||||||
|
|
||||||
export interface LatestBeeReleaseHook {
|
export interface LatestBeeReleaseHook {
|
||||||
latestBeeRelease: LatestBeeRelease | null
|
latestBeeRelease: LatestBeeRelease | null
|
||||||
@@ -44,6 +45,54 @@ export const useIsBeeDesktop = (conf: Config = config): IsBeeDesktopHook => {
|
|||||||
return { isBeeDesktop, isLoading }
|
return { isBeeDesktop, isLoading }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface BeeConfig {
|
||||||
|
'api-addr': string
|
||||||
|
'debug-api-addr': string
|
||||||
|
'debug-api-enable': boolean
|
||||||
|
password: string
|
||||||
|
'swap-enable': boolean
|
||||||
|
'swap-initial-deposit': bigint
|
||||||
|
mainnet: boolean
|
||||||
|
'full-node': boolean
|
||||||
|
'chain-enable': boolean
|
||||||
|
'cors-allowed-origins': string
|
||||||
|
'resolver-options': string
|
||||||
|
'use-postage-snapshot': boolean
|
||||||
|
'data-dir': string
|
||||||
|
transaction: string
|
||||||
|
'block-hash': string
|
||||||
|
'swap-endpoint'?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GetBeeConfig {
|
||||||
|
config: BeeConfig | null
|
||||||
|
isLoading: boolean
|
||||||
|
error: Error | null
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useGetBeeConfig = (conf: Config = config): GetBeeConfig => {
|
||||||
|
const [beeConfig, setBeeConfig] = useState<BeeConfig | null>(null)
|
||||||
|
const [isLoading, setLoading] = useState<boolean>(true)
|
||||||
|
const [error, setError] = useState<Error | null>(null)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
getJson<BeeConfig>(`${conf.BEE_DESKTOP_URL}/config`)
|
||||||
|
.then(beeConf => {
|
||||||
|
setBeeConfig(beeConf)
|
||||||
|
setError(null)
|
||||||
|
})
|
||||||
|
.catch((err: Error) => {
|
||||||
|
setError(err)
|
||||||
|
setBeeConfig(null)
|
||||||
|
})
|
||||||
|
.finally(() => {
|
||||||
|
setLoading(false)
|
||||||
|
})
|
||||||
|
}, [conf])
|
||||||
|
|
||||||
|
return { config: beeConfig, isLoading, error }
|
||||||
|
}
|
||||||
|
|
||||||
export const useLatestBeeRelease = (): LatestBeeReleaseHook => {
|
export const useLatestBeeRelease = (): LatestBeeReleaseHook => {
|
||||||
const [latestBeeRelease, setLatestBeeRelease] = useState<LatestBeeRelease | null>(null)
|
const [latestBeeRelease, setLatestBeeRelease] = useState<LatestBeeRelease | null>(null)
|
||||||
const [isLoadingLatestBeeRelease, setLoading] = useState<boolean>(false)
|
const [isLoadingLatestBeeRelease, setLoading] = useState<boolean>(false)
|
||||||
|
|||||||
@@ -1,10 +1,36 @@
|
|||||||
|
import CircularProgress from '@material-ui/core/CircularProgress'
|
||||||
import { ReactElement, useContext } from 'react'
|
import { ReactElement, useContext } from 'react'
|
||||||
import ExpandableList from '../../components/ExpandableList'
|
import ExpandableList from '../../components/ExpandableList'
|
||||||
import ExpandableListItemInput from '../../components/ExpandableListItemInput'
|
import ExpandableListItemInput from '../../components/ExpandableListItemInput'
|
||||||
import { Context as SettingsContext } from '../../providers/Settings'
|
import { Context as SettingsContext } from '../../providers/Settings'
|
||||||
|
|
||||||
export default function Settings(): ReactElement {
|
export default function SettingsPage(): ReactElement {
|
||||||
const { apiUrl, apiDebugUrl, setApiUrl, setDebugApiUrl, lockedApiSettings } = useContext(SettingsContext)
|
const { apiUrl, apiDebugUrl, setApiUrl, setDebugApiUrl, lockedApiSettings, config, isLoading } =
|
||||||
|
useContext(SettingsContext)
|
||||||
|
|
||||||
|
if (isLoading) {
|
||||||
|
return (
|
||||||
|
<div style={{ textAlign: 'center', width: '100%' }}>
|
||||||
|
<CircularProgress />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run within Bee Desktop, display read only config
|
||||||
|
if (config) {
|
||||||
|
return (
|
||||||
|
<ExpandableList label="Bee Desktop Settings" defaultOpen>
|
||||||
|
<ExpandableListItemInput label="Bee API" value={config['api-addr']} locked />
|
||||||
|
<ExpandableListItemInput label="Bee Debug API" value={config['debug-api-addr']} locked />
|
||||||
|
<ExpandableListItemInput label="CORS" value={config['cors-allowed-origins']} locked />
|
||||||
|
<ExpandableListItemInput label="Data DIR" value={config['data-dir']} locked />
|
||||||
|
<ExpandableListItemInput label="ENS resolver URL" value={config['resolver-options']} locked />
|
||||||
|
{config['swap-endpoint'] && (
|
||||||
|
<ExpandableListItemInput label="SWAP endpoint" value={config['swap-endpoint']} locked />
|
||||||
|
)}
|
||||||
|
</ExpandableList>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ExpandableList label="API Settings" defaultOpen>
|
<ExpandableList label="API Settings" defaultOpen>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { Bee, BeeDebug } from '@ethersphere/bee-js'
|
import { Bee, BeeDebug } from '@ethersphere/bee-js'
|
||||||
import { createContext, ReactChild, ReactElement, useEffect, useState } from 'react'
|
import { createContext, ReactChild, ReactElement, useEffect, useState } from 'react'
|
||||||
import { config } from '../config'
|
import { config } from '../config'
|
||||||
|
import { BeeConfig, useGetBeeConfig } from '../hooks/apiHooks'
|
||||||
|
|
||||||
interface ContextInterface {
|
interface ContextInterface {
|
||||||
apiUrl: string
|
apiUrl: string
|
||||||
@@ -11,6 +12,9 @@ interface ContextInterface {
|
|||||||
setDebugApiUrl: (url: string) => void
|
setDebugApiUrl: (url: string) => void
|
||||||
lockedApiSettings: boolean
|
lockedApiSettings: boolean
|
||||||
desktopApiKey: string
|
desktopApiKey: string
|
||||||
|
config: BeeConfig | null
|
||||||
|
isLoading: boolean
|
||||||
|
error: Error | null
|
||||||
}
|
}
|
||||||
|
|
||||||
const initialValues: ContextInterface = {
|
const initialValues: ContextInterface = {
|
||||||
@@ -22,6 +26,9 @@ const initialValues: ContextInterface = {
|
|||||||
setDebugApiUrl: () => {}, // eslint-disable-line
|
setDebugApiUrl: () => {}, // eslint-disable-line
|
||||||
lockedApiSettings: false,
|
lockedApiSettings: false,
|
||||||
desktopApiKey: '',
|
desktopApiKey: '',
|
||||||
|
config: null,
|
||||||
|
isLoading: true,
|
||||||
|
error: null,
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Context = createContext<ContextInterface>(initialValues)
|
export const Context = createContext<ContextInterface>(initialValues)
|
||||||
@@ -46,9 +53,10 @@ export function Provider({
|
|||||||
const [beeDebugApi, setBeeDebugApi] = useState<BeeDebug | null>(null)
|
const [beeDebugApi, setBeeDebugApi] = useState<BeeDebug | null>(null)
|
||||||
const [lockedApiSettings] = useState<boolean>(Boolean(extLockedApiSettings))
|
const [lockedApiSettings] = useState<boolean>(Boolean(extLockedApiSettings))
|
||||||
const [desktopApiKey, setDesktopApiKey] = useState<string>(initialValues.desktopApiKey)
|
const [desktopApiKey, setDesktopApiKey] = useState<string>(initialValues.desktopApiKey)
|
||||||
|
const { config, isLoading, error } = useGetBeeConfig()
|
||||||
|
|
||||||
const url = beeApiUrl || apiUrl
|
const url = config?.['api-addr'] || beeApiUrl || apiUrl
|
||||||
const debugUrl = beeDebugApiUrl || apiDebugUrl
|
const debugUrl = config?.['debug-api-addr'] || beeDebugApiUrl || apiDebugUrl
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const urlSearchParams = new URLSearchParams(window.location.search)
|
const urlSearchParams = new URLSearchParams(window.location.search)
|
||||||
@@ -90,6 +98,9 @@ export function Provider({
|
|||||||
setDebugApiUrl,
|
setDebugApiUrl,
|
||||||
lockedApiSettings,
|
lockedApiSettings,
|
||||||
desktopApiKey,
|
desktopApiKey,
|
||||||
|
config,
|
||||||
|
isLoading,
|
||||||
|
error,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
+2
-2
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
|
|
||||||
export function getJson(url: string): Promise<Record<string, any>> {
|
export function getJson<T extends Record<string, any>>(url: string): Promise<T> {
|
||||||
return sendRequest(url, 'GET')
|
return sendRequest(url, 'GET') as Promise<T>
|
||||||
}
|
}
|
||||||
|
|
||||||
export function postJson(url: string, data?: Record<string, any>): Promise<Record<string, unknown>> {
|
export function postJson(url: string, data?: Record<string, any>): Promise<Record<string, unknown>> {
|
||||||
|
|||||||
Reference in New Issue
Block a user