From 9a29aa9232c78e7915ff7def44732039bebbf50f Mon Sep 17 00:00:00 2001 From: Igor Lobanov Date: Thu, 4 Jul 2024 12:43:47 +0300 Subject: [PATCH 1/2] Pull request #2251: ADG-8776 clear query log filter fix Merge in DNS/adguard-home from ADG-8776 to master Squashed commit of the following: commit d9f3acf7298c1cd39c980b9d6743624e18cdd8bf Author: Igor Lobanov Date: Wed Jul 3 17:55:18 2024 +0200 clear query log filter fix --- client/src/components/Logs/Filters/Form.tsx | 14 ++++++-------- client/src/components/Logs/Filters/index.tsx | 9 ++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/client/src/components/Logs/Filters/Form.tsx b/client/src/components/Logs/Filters/Form.tsx index 65bbfcf029d..f1b5b7be552 100644 --- a/client/src/components/Logs/Filters/Form.tsx +++ b/client/src/components/Logs/Filters/Form.tsx @@ -1,6 +1,6 @@ import React, { useEffect } from 'react'; -import { Field, reduxForm } from 'redux-form'; +import { Field, type InjectedFormProps, reduxForm } from 'redux-form'; import { useTranslation } from 'react-i18next'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; @@ -104,14 +104,13 @@ const FORM_NAMES = { response_status: 'response_status', }; -interface FiltersFormProps { +type FiltersFormProps = { className?: string; responseStatusClass?: string; - change: (...args: unknown[]) => unknown; - setIsLoading?: (...args: unknown[]) => unknown; -} + setIsLoading: (...args: unknown[]) => unknown; +}; -const Form = (props: FiltersFormProps) => { +const Form = (props: FiltersFormProps & InjectedFormProps) => { const { className = '', responseStatusClass, setIsLoading, change } = props; const { t } = useTranslation(); @@ -142,7 +141,6 @@ const Form = (props: FiltersFormProps) => { const onInputClear = async () => { setIsLoading(true); - change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]); setIsLoading(false); }; @@ -195,7 +193,7 @@ const Form = (props: FiltersFormProps) => { ); }; -export default reduxForm({ +export const FiltersForm = reduxForm, FiltersFormProps>({ form: FORM_NAME.LOGS_FILTER, enableReinitialize: true, })(Form); diff --git a/client/src/components/Logs/Filters/index.tsx b/client/src/components/Logs/Filters/index.tsx index 9390c53142e..dfdbf3ecadd 100644 --- a/client/src/components/Logs/Filters/index.tsx +++ b/client/src/components/Logs/Filters/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch } from 'react-redux'; -import Form from './Form'; +import { FiltersForm } from './Form'; import { refreshFilteredLogs } from '../../../actions/queryLogs'; import { addSuccessToast } from '../../../actions/toasts'; @@ -38,12 +38,7 @@ const Filters = ({ filter, setIsLoading }: FiltersProps) => { - -
+ ); }; From 9a6dd0dc5561c1588080974eb27e11aaf740ca4a Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Fri, 5 Jul 2024 15:55:53 +0300 Subject: [PATCH 2/2] Pull request 2253: upg-chlog Squashed commit of the following: commit 3548d7a3e8a44afd1bc5fd8de7bf28fb9941e033 Author: Ainar Garipov Date: Fri Jul 5 15:46:37 2024 +0300 all: imp chlog better commit c465b408e9a8da536dd97d884e391a03e1db293b Author: Ainar Garipov Date: Fri Jul 5 15:41:11 2024 +0300 all: imp chlog commit 6b2de2834e9ece13cf3343107dafeea3b206dac9 Author: Ainar Garipov Date: Fri Jul 5 15:33:05 2024 +0300 all: upd chlog --- CHANGELOG.md | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e3951a19b9..757a40f1e72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,15 +18,25 @@ TODO(a.garipov): Use the common markdown formatting tools. + + + + +## [v0.107.52] - 2024-07-04 + +See also the [v0.107.52 GitHub milestone][ms-v0.107.52]. + ### Security - Go version has been updated to prevent the possibility of exploiting the Go @@ -48,8 +58,10 @@ NOTE: Add new changes BELOW THIS COMMENT. or via the CLI (with root privileges): ```sh + ./AdGuardHome -s stop ./AdGuardHome -s uninstall ./AdGuardHome -s install + ./AdGuardHome -s start ``` Don't forget to backup your configuration file and other important data before @@ -61,8 +73,6 @@ NOTE: Add new changes BELOW THIS COMMENT. ### Fixed -- Unnecessary validation call on the encryption page. -- Missing version in the footer. - Panic caused by missing user-specific blocked services object in configuration file ([#7069]). - Tracking `/etc/hosts` file changes causing panics within particular @@ -76,9 +86,7 @@ NOTE: Add new changes BELOW THIS COMMENT. [go-1.22.5]: https://groups.google.com/g/golang-announce/c/gyb7aM1C9H4 [install-script]: https://github.com/AdguardTeam/AdGuardHome/?tab=readme-ov-file#automated-install-linux-and-mac - +[ms-v0.107.52]: https://github.com/AdguardTeam/AdGuardHome/milestone/87?closed=1 @@ -3061,11 +3069,12 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2]. -[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.51...HEAD +[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.52...HEAD +[v0.107.52]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.51...v0.107.52 [v0.107.51]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.50...v0.107.51 [v0.107.50]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.49...v0.107.50 [v0.107.49]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.48...v0.107.49