mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-08-16 14:10:22 +03:00
Pull request: ADG-8737 fixed missing version in the footer, unnecessary validation call on the encryption page
Squashed commit of the following: commit1c4a15f2f3
Merge:399d28e67
9d1c45fd9
Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jul 2 13:08:21 2024 +0300 Merge branch 'master' into ADG-8737 commit399d28e67f
Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jul 1 19:37:05 2024 +0300 fix install commit91d5dd23ce
Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jul 1 17:40:22 2024 +0300 home: imp logs commit06917df08b
Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jul 1 16:38:38 2024 +0300 ADG-8737 add missing version, remove validation call
This commit is contained in:
parent
9d1c45fd94
commit
fcdebfa4d4
@ -56,6 +56,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
- Unnecessary validation call on the encryption page.
|
||||||
|
- Missing version in the footer.
|
||||||
- Panic caused by missing user-specific blocked services object in configuration
|
- Panic caused by missing user-specific blocked services object in configuration
|
||||||
file ([#7069]).
|
file ([#7069]).
|
||||||
- Tracking `/etc/hosts` file changes causing panics within particular
|
- Tracking `/etc/hosts` file changes causing panics within particular
|
||||||
|
@ -38,7 +38,7 @@ class Encryption extends Component<EncryptionProps> {
|
|||||||
handleFormChange = debounce((values) => {
|
handleFormChange = debounce((values) => {
|
||||||
const submitValues = this.getSubmitValues(values);
|
const submitValues = this.getSubmitValues(values);
|
||||||
|
|
||||||
if (submitValues.enabled || submitValues.serve_plain_dns) {
|
if (submitValues.enabled) {
|
||||||
this.props.validateTlsConfig(submitValues);
|
this.props.validateTlsConfig(submitValues);
|
||||||
}
|
}
|
||||||
}, DEBOUNCE_TIMEOUT);
|
}, DEBOUNCE_TIMEOUT);
|
||||||
|
@ -12,12 +12,11 @@ const Version = () => {
|
|||||||
const dashboard = useSelector((state: RootState) => state.dashboard, shallowEqual);
|
const dashboard = useSelector((state: RootState) => state.dashboard, shallowEqual);
|
||||||
const install = useSelector((state: RootState) => state.install, shallowEqual);
|
const install = useSelector((state: RootState) => state.install, shallowEqual);
|
||||||
|
|
||||||
if (!dashboard || !install) {
|
if (!dashboard && !install) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { dnsVersion, processingVersion, checkUpdateFlag } = dashboard;
|
const version = dashboard?.dnsVersion || install?.dnsVersion;
|
||||||
const version = dnsVersion || install?.dnsVersion;
|
|
||||||
|
|
||||||
const onClick = () => {
|
const onClick = () => {
|
||||||
dispatch(getVersion(true));
|
dispatch(getVersion(true));
|
||||||
@ -35,12 +34,12 @@ const Version = () => {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{checkUpdateFlag && (
|
{dashboard?.checkUpdateFlag && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
|
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
|
||||||
onClick={onClick}
|
onClick={onClick}
|
||||||
disabled={processingVersion}
|
disabled={dashboard?.processingVersion}
|
||||||
title={t('check_updates_now')}>
|
title={t('check_updates_now')}>
|
||||||
<svg className="icons icon12">
|
<svg className="icons icon12">
|
||||||
<use xlinkHref="#refresh" />
|
<use xlinkHref="#refresh" />
|
||||||
|
@ -133,7 +133,14 @@ func webCheckPortAvailable(port uint16) (ok bool) {
|
|||||||
|
|
||||||
addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), port)
|
addrPort := netip.AddrPortFrom(config.HTTPConfig.Address.Addr(), port)
|
||||||
|
|
||||||
return aghnet.CheckPort("tcp", addrPort) == nil
|
err := aghnet.CheckPort("tcp", addrPort)
|
||||||
|
if err != nil {
|
||||||
|
log.Info("web: warning: checking https port: %s", err)
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// tlsConfigChanged updates the TLS configuration and restarts the HTTPS server
|
// tlsConfigChanged updates the TLS configuration and restarts the HTTPS server
|
||||||
|
Loading…
Reference in New Issue
Block a user