Merge in DNS/adguard-home from ADG-9415 to master Squashed commit of the following: commit76bf99499aMerge:29529970a0389515eeAuthor: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 26 18:31:41 2025 +0300 Merge branch 'master' into ADG-9415 commit29529970a3Merge:b49790daf782a1a982Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 24 15:44:38 2025 +0300 Merge branch 'master' into ADG-9415 commitb49790daf8Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 15:30:18 2025 +0300 fix default lease duration value commitcb307472ecAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:35:26 2025 +0300 fix default response status commit115e743e1aAuthor: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 24 10:32:46 2025 +0300 fix upstream description commit26b0eddacaAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:40:41 2025 +0300 use const for test config file commit58faa7c537Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 18 17:31:04 2025 +0300 fix install config commit0a3346d911Author: Ildar Kamalov <ik@adguard.com> Date: Mon Feb 17 15:25:23 2025 +0300 fix install check config commit17c4c26ea8Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 17:18:20 2025 +0300 fix query log commit14a2685ae3Author: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 15:52:36 2025 +0300 fix dhcp initial values commite7a8db7afdAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:37:24 2025 +0300 fix encryption form values commit1c8917f7acAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 14:07:29 2025 +0300 fix blocked services submit commit4dfa536ceaAuthor: Ildar Kamalov <ik@adguard.com> Date: Fri Feb 14 13:50:47 2025 +0300 dns config ip validation commit4fee83fe13Author: Ildar Kamalov <ik@adguard.com> Date: Wed Feb 12 17:49:54 2025 +0300 add playwright warning commit8c2f36e7a6Author: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 18:36:18 2025 +0300 fix config file name commit83db5f33dcAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 16:16:43 2025 +0300 temp config file commit9080c1620fAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 15:01:46 2025 +0300 update readme commitee1520307fMerge:fd12e33c02fe2d254bAuthor: Ildar Kamalov <ik@adguard.com> Date: Tue Feb 11 14:44:06 2025 +0300 Merge branch 'master' into ADG-9415 commitfd12e33c06Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 10:29:43 2025 +0100 added typecheck on build, fixed eslint commitb3849eebc4Merge:225167a8b9bf3ee128Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Feb 10 09:43:32 2025 +0100 Merge branch 'ADG-9415' of https://bit.int.agrd.dev/scm/dns/adguard-home into ADG-9415 ... and 94 more commits
125 lines
3.8 KiB
TypeScript
125 lines
3.8 KiB
TypeScript
import React, { useEffect, Fragment } from 'react';
|
|
import { useDispatch, useSelector } from 'react-redux';
|
|
import debounce from 'lodash/debounce';
|
|
|
|
import * as actionCreators from '../../actions/install';
|
|
|
|
import { getWebAddress } from '../../helpers/helpers';
|
|
import { INSTALL_TOTAL_STEPS, ALL_INTERFACES_IP, DEBOUNCE_TIMEOUT } from '../../helpers/constants';
|
|
|
|
import Loading from '../../components/ui/Loading';
|
|
import Greeting from './Greeting';
|
|
import { ConfigType, DnsConfig, Settings, WebConfig } from './Settings';
|
|
import { Devices } from './Devices';
|
|
import { Submit } from './Submit';
|
|
import { Progress } from './Progress';
|
|
import { Auth } from './Auth';
|
|
import Toasts from '../../components/Toasts';
|
|
import Footer from '../../components/ui/Footer';
|
|
import Icons from '../../components/ui/Icons';
|
|
import { Logo } from '../../components/ui/svg/logo';
|
|
|
|
import './Setup.css';
|
|
import '../../components/ui/Tabler.css';
|
|
import { InstallInterface, InstallState } from '../../initialState';
|
|
|
|
export const Setup = () => {
|
|
const dispatch = useDispatch();
|
|
|
|
const install = useSelector((state: InstallState) => state.install);
|
|
const { processingDefault, step, web, dns, staticIp, interfaces } = install;
|
|
|
|
useEffect(() => {
|
|
dispatch(actionCreators.getDefaultAddresses());
|
|
}, []);
|
|
|
|
const handleFormSubmit = (values: any) => {
|
|
const config = { ...values };
|
|
delete config.staticIp;
|
|
|
|
if (web.port && dns.port) {
|
|
dispatch(
|
|
actionCreators.setAllSettings({
|
|
web,
|
|
dns,
|
|
...config,
|
|
}),
|
|
);
|
|
}
|
|
};
|
|
|
|
const checkConfig = debounce((values) => {
|
|
const { web, dns } = values;
|
|
|
|
if (values && web.port && dns.port) {
|
|
dispatch(actionCreators.checkConfig({ web, dns, set_static_ip: false }));
|
|
}
|
|
}, DEBOUNCE_TIMEOUT);
|
|
|
|
const handleFix = (web: WebConfig, dns: DnsConfig, set_static_ip: boolean) => {
|
|
dispatch(actionCreators.checkConfig({ web, dns, set_static_ip }));
|
|
};
|
|
|
|
const openDashboard = (ip: string, port: number) => {
|
|
let address = getWebAddress(ip, port);
|
|
if (ip === ALL_INTERFACES_IP) {
|
|
address = getWebAddress(window.location.hostname, port);
|
|
}
|
|
window.location.replace(address);
|
|
};
|
|
|
|
const handleNextStep = () => {
|
|
if (step < INSTALL_TOTAL_STEPS) {
|
|
dispatch(actionCreators.nextStep());
|
|
}
|
|
};
|
|
|
|
const renderPage = (step: number, config: ConfigType, interfaces: InstallInterface[]) => {
|
|
switch (step) {
|
|
case 1:
|
|
return <Greeting />;
|
|
case 2:
|
|
return (
|
|
<Settings
|
|
config={config}
|
|
initialValues={config}
|
|
interfaces={interfaces}
|
|
handleSubmit={handleNextStep}
|
|
validateForm={checkConfig}
|
|
handleFix={handleFix}
|
|
/>
|
|
);
|
|
case 3:
|
|
return <Auth onAuthSubmit={handleFormSubmit} />;
|
|
case 4:
|
|
return <Devices interfaces={interfaces} dnsConfig={dns} />;
|
|
case 5:
|
|
return <Submit openDashboard={openDashboard} webConfig={web} />;
|
|
default:
|
|
return false;
|
|
}
|
|
};
|
|
|
|
if (processingDefault) {
|
|
return <Loading />;
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<div className="setup">
|
|
<div className="setup__container">
|
|
<Logo className="setup__logo" />
|
|
{renderPage(step, { web, dns, staticIp }, interfaces)}
|
|
<Progress step={step} />
|
|
</div>
|
|
</div>
|
|
|
|
<Footer />
|
|
|
|
<Toasts />
|
|
|
|
<Icons />
|
|
</>
|
|
);
|
|
};
|