Skip to content

Commit 1b22d12

Browse files
committed
Include baseline configuration in query params, run fmt
1 parent 2a925fc commit 1b22d12

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

frontend/src/pages/LandingPage/Index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ export default function LandingPage() {
1010
Aptos Node Tools
1111
</Typography>
1212
<h2>BETA</h2>
13-
<DividerHero/>
13+
<DividerHero />
1414
<Grid item xs={12} md={6} lg={4} key={1}>
15-
<a href="/#/node_checker" style={{ textDecoration: 'none' }}>
15+
<a href="/#/node_checker" style={{textDecoration: "none"}}>
1616
<Button variant="primary">Node Checker</Button>
1717
</a>
1818
</Grid>

frontend/src/pages/NodeChecker/Client.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import {EvaluationSummary, NodeCheckerClient} from "aptos-node-checker-client";
22
import {GlobalState} from "../../GlobalState";
33

4-
export const DEFAULT_NHC_INSTANCE =
5-
"https://node-checker.dev.gcp.aptosdev.com";
4+
export const DEFAULT_NHC_INSTANCE = "https://node-checker.dev.gcp.aptosdev.com";
65

76
export const NHC_INSTANCE_OVERRIDES = {
87
local: "http://127.0.0.1:20121",

frontend/src/pages/NodeChecker/ConfigurationSelect.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
MinimalConfiguration,
1212
} from "./Client";
1313
import {useGlobalState} from "../../GlobalState";
14+
import {useSearchParams} from "react-router-dom";
1415

1516
interface ConfigurationSelectProps {
1617
baselineConfiguration: MinimalConfiguration | undefined;
@@ -31,6 +32,8 @@ export default function ConfigurationSelect({
3132
Map<string, MinimalConfiguration> | undefined
3233
>(undefined);
3334

35+
const [searchParams, _setSearchParams] = useSearchParams();
36+
3437
const handleChange = (event: SelectChangeEvent<string>) => {
3538
const configurationKey = event.target.value;
3639
updateBaselineConfiguration(validConfigurations!.get(configurationKey));
@@ -47,7 +50,16 @@ export default function ConfigurationSelect({
4750
getConfigurations({nhcUrl: nhcUrl})
4851
.then((configurations) => {
4952
updateValidConfigurations(configurations);
50-
updateBaselineConfiguration(configurations.values().next().value);
53+
// If a configuration was included in the URL and it is a valid option,
54+
// use that. Otherwise just use the first one.
55+
if (searchParams.get("baselineConfiguration")) {
56+
const configurationKey = searchParams.get("baselineConfiguration")!;
57+
if (configurations.has(configurationKey)) {
58+
updateBaselineConfiguration(configurations.get(configurationKey));
59+
}
60+
} else {
61+
updateBaselineConfiguration(configurations.values().next().value);
62+
}
5163
updateErrorMessage(undefined);
5264
})
5365
.catch((_error) => {

frontend/src/pages/NodeChecker/Index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import ConfigurationSelect from "./ConfigurationSelect";
1010
import {useGlobalState} from "../../GlobalState";
1111
import ErrorSnackbar from "./ErrorSnackbar";
1212
import useAddressInput from "../../api/hooks/useAddressInput";
13-
import { useSearchParams } from 'react-router-dom';
13+
import {useSearchParams} from "react-router-dom";
1414

1515
export function NodeCheckerPage() {
1616
const [state, _dispatch] = useGlobalState();
@@ -105,6 +105,7 @@ export function NodeCheckerPage() {
105105
url: url,
106106
apiPort: apiPort,
107107
noisePort: noisePort,
108+
baselineConfiguration: baselineConfiguration!.name,
108109
});
109110
try {
110111
const evaluationSummary = await checkNode({

0 commit comments

Comments
 (0)