docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
/**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); | <mask> export const setLogsFilterRequest = createAction('SET_LOGS_FILTER_REQUEST');
<mask> export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
<mask> export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
<mask>
<mask> export const setLogsFilter = (filter) => async (dispatch) => {
<mask> dispatch(setLogsFilterRequest());
<mask> try {
<mask> const data = await getLogsWithParams({ older_than: '', filter });
<mask> const additionalData = await checkFilteredLogs(data, filter, dispatch);
<mask> const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
</s> add </s> remove const data = await getLogsWithParams({ older_than: '', filter });
</s> add const data = await getLogsWithParams({
older_than: '',
filter,
}); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
</s> add dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); </s> remove dispatch(setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }));
</s> add dispatch(setLogsPagination({
page,
pageSize: TABLE_DEFAULT_PAGE_SIZE,
})); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
const data = await getLogsWithParams({
older_than: '',
filter,
}); | <mask>
<mask> export const setLogsFilter = (filter) => async (dispatch) => {
<mask> dispatch(setLogsFilterRequest());
<mask> try {
<mask> const data = await getLogsWithParams({ older_than: '', filter });
<mask> const additionalData = await checkFilteredLogs(data, filter, dispatch);
<mask> const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
<mask>
<mask> dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
<mask> dispatch(setLogsPage(TABLE_FIRST_PAGE));
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
</s> add dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); </s> remove export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
</s> add </s> remove dispatch(setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }));
</s> add dispatch(setLogsPagination({
page,
pageSize: TABLE_DEFAULT_PAGE_SIZE,
})); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); | <mask> const data = await getLogsWithParams({ older_than: '', filter });
<mask> const additionalData = await checkFilteredLogs(data, filter, dispatch);
<mask> const updatedData = additionalData.logs ? { ...data, ...additionalData } : data;
<mask>
<mask> dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
<mask> dispatch(setLogsPage(TABLE_FIRST_PAGE));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setLogsFilterFailure(error));
<mask> }
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const data = await getLogsWithParams({ older_than: '', filter });
</s> add const data = await getLogsWithParams({
older_than: '',
filter,
}); </s> remove dispatch(setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }));
</s> add dispatch(setLogsPagination({
page,
pageSize: TABLE_DEFAULT_PAGE_SIZE,
})); </s> remove dispatch(setLogsFilterFailure(error));
</s> add dispatch(setFilteredLogsFailure(error)); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
dispatch(setFilteredLogsFailure(error)); | <mask> dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
<mask> dispatch(setLogsPage(TABLE_FIRST_PAGE));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setLogsFilterFailure(error));
<mask> }
<mask> };
<mask>
<mask> export const clearLogsRequest = createAction('CLEAR_LOGS_REQUEST');
<mask> export const clearLogsFailure = createAction('CLEAR_LOGS_FAILURE');
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
</s> add dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); </s> remove dispatch(setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }));
</s> add dispatch(setLogsPagination({
page,
pageSize: TABLE_DEFAULT_PAGE_SIZE,
})); </s> remove const data = await getLogsWithParams({ older_than: '', filter });
</s> add const data = await getLogsWithParams({
older_than: '',
filter,
}); </s> remove export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
export const resetFilteredLogs = () => setFilteredLogs(DEFAULT_LOGS_FILTER);
export const refreshFilteredLogs = () => async (dispatch, getState) => {
const { filter } = getState().queryLogs;
await dispatch(setFilteredLogs(filter));
};
| <mask> dispatch(setFilteredLogsFailure(error));
<mask> }
<mask> };
<mask>
<mask> export const clearLogsRequest = createAction('CLEAR_LOGS_REQUEST');
<mask> export const clearLogsFailure = createAction('CLEAR_LOGS_FAILURE');
<mask> export const clearLogsSuccess = createAction('CLEAR_LOGS_SUCCESS');
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove dispatch(setLogsFilterFailure(error));
</s> add dispatch(setFilteredLogsFailure(error)); </s> remove export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
</s> add </s> remove export const setLogsFilter = (filter) => async (dispatch) => {
dispatch(setLogsFilterRequest());
</s> add /**
*
* @param filter
* @param {string} filter.search
* @param {string} filter.response_status query field of RESPONSE_FILTER object
* @returns function
*/
export const setLogsFilter = (filter) => setLogsFilterRequest(filter);
export const setFilteredLogsRequest = createAction('SET_FILTERED_LOGS_REQUEST');
export const setFilteredLogsFailure = createAction('SET_FILTERED_LOGS_FAILURE');
export const setFilteredLogsSuccess = createAction('SET_FILTERED_LOGS_SUCCESS');
export const setFilteredLogs = (filter) => async (dispatch) => {
dispatch(setFilteredLogsRequest()); </s> remove logs, oldest, older_than, filter, ...values,
</s> add logs,
oldest,
older_than,
filter,
...values, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/actions/queryLogs.js |
import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers'; | <mask> import i18n from '../../i18n';
<mask> import Loading from '../ui/Loading';
<mask> import { FILTERS_URLS, MENU_URLS, SETTINGS_URLS } from '../../helpers/constants';
<mask> import Services from '../Filters/Services';
<mask> import { setHtmlLangAttr } from '../../helpers/helpers';
<mask>
<mask> class App extends Component {
<mask> componentDidMount() {
<mask> this.props.getDnsStatus();
<mask> }
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove BLOCK_ACTIONS, smallScreenSize,
</s> add BLOCK_ACTIONS, </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/App/index.js |
<Route
path={[`${MENU_URLS.logs}${getLogsUrlParams(':search?', ':response_status?')}`, MENU_URLS.logs]}
component={Logs} /> | <mask> )}
<mask> {!dashboard.processing && dashboard.isCoreRunning && (
<mask> <>
<mask> <Route path={MENU_URLS.root} exact component={Dashboard} />
<mask> <Route path={MENU_URLS.logs} component={Logs} />
<mask> <Route path={MENU_URLS.guide} component={SetupGuide} />
<mask> <Route path={SETTINGS_URLS.settings} component={Settings} />
<mask> <Route path={SETTINGS_URLS.dns} component={Dns} />
<mask> <Route path={SETTINGS_URLS.encryption} component={Encryption} />
<mask> <Route path={SETTINGS_URLS.dhcp} component={Dhcp} />
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove </Fragment>
</s> add </> </s> remove }) => <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder} />
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<Tooltip text={tooltip} type='tooltip-custom--logs' />
</s> add onKeyDown,
normalizeOnBlur,
}) => {
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
return <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder}
onKeyDown={onKeyDown}
onBlur={onBlur}
/>
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<IconTooltip text={tooltip} type='tooltip-custom--logs' /> </s> remove />
</s> add /> </s> remove {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/App/index.js |
return <Cell value={value}
percent={percent}
color={STATUS_COLORS.red}
search={row.original.domain}
/>; | <mask> const CountCell = (totalBlocked) => function cell(row) {
<mask> const { value } = row;
<mask> const percent = getPercent(totalBlocked, value);
<mask>
<mask> return <Cell value={value} percent={percent} color={STATUS_COLORS.red} />;
<mask> };
<mask>
<mask> const BlockedDomains = ({
<mask> t,
<mask> refreshButton,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor}
search={row.original.domain} />; </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor} search={row.original.ip} />; </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { </s> remove t,
</s> add </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/BlockedDomains.js |
return <Cell value={value} percent={percent} color={percentColor} search={row.original.ip} />; | <mask> const { value } = row;
<mask> const percent = getPercent(dnsQueries, value);
<mask> const percentColor = getClientsPercentColor(percent);
<mask>
<mask> return <Cell value={value} percent={percent} color={percentColor} />;
<mask> };
<mask>
<mask> const renderBlockingButton = (ipMatchListStatus, ip, handleClick, processing) => {
<mask> const buttonProps = ipMatchListStatus === IP_MATCH_LIST_STATUS.NOT_FOUND
<mask> ? {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor}
search={row.original.domain} />; </s> remove return <Cell value={value} percent={percent} color={STATUS_COLORS.red} />;
</s> add return <Cell value={value}
percent={percent}
color={STATUS_COLORS.red}
search={row.original.domain}
/>; </s> remove const isActivePage = Object.values(URLS).some((item) => item === pathname);
</s> add const isActivePage = Object.values(URLS)
.some((item) => item === pathname); </s> remove const className = classNames('text-truncate key-colon o-hidden', {
</s> add const className = classNames('text-truncate o-hidden', { </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Clients.js |
import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import round from 'lodash/round';
<mask>
<mask> import Card from '../ui/Card';
<mask> import Tooltip from '../ui/Tooltip';
<mask> import { formatNumber } from '../../helpers/helpers';
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove
</s> add import LogsSearchLink from './LogsSearchLink'; </s> remove import { useDispatch } from 'react-redux';
</s> add | [
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
import { shallowEqual, useSelector } from 'react-redux'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import round from 'lodash/round';
<mask>
<mask> import Card from '../ui/Card';
<mask> import Tooltip from '../ui/Tooltip';
<mask> import { formatNumber } from '../../helpers/helpers';
<mask>
<mask> const tooltipType = 'tooltip-custom--narrow';
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove const tooltipType = 'tooltip-custom--narrow';
</s> add return <tr key={label}>
<td>
<Trans components={translationComponents}>{label}</Trans>
<IconTooltip text={tooltipTitle} type="tooltip-custom--narrow" />
</td>
<td className="text-right"><strong>{content}</strong></td>
</tr>;
}; </s> remove import { useDispatch } from 'react-redux';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
import IconTooltip from '../ui/IconTooltip'; | <mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import round from 'lodash/round';
<mask>
<mask> import Card from '../ui/Card';
<mask> import Tooltip from '../ui/Tooltip';
<mask> import { formatNumber } from '../../helpers/helpers';
<mask>
<mask> const tooltipType = 'tooltip-custom--narrow';
<mask>
<mask> const Counters = (props) => {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; </s> remove const tooltipType = 'tooltip-custom--narrow';
</s> add return <tr key={label}>
<td>
<Trans components={translationComponents}>{label}</Trans>
<IconTooltip text={tooltipTitle} type="tooltip-custom--narrow" />
</td>
<td className="text-right"><strong>{content}</strong></td>
</tr>;
}; </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
import LogsSearchLink from '../ui/LogsSearchLink';
import { RESPONSE_FILTER } from '../../helpers/constants';
const Row = ({
label, count, response_status, tooltipTitle, translationComponents,
}) => {
const content = response_status
? <LogsSearchLink response_status={response_status}>{formatNumber(count)}</LogsSearchLink>
: count; | <mask> import IconTooltip from '../ui/IconTooltip';
<mask> import { formatNumber } from '../../helpers/helpers';
<mask>
<mask> return <tr key={label}>
<mask> <td>
<mask> <Trans components={translationComponents}>{label}</Trans>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const tooltipType = 'tooltip-custom--narrow';
</s> add return <tr key={label}>
<td>
<Trans components={translationComponents}>{label}</Trans>
<IconTooltip text={tooltipTitle} type="tooltip-custom--narrow" />
</td>
<td className="text-right"><strong>{content}</strong></td>
</tr>;
}; </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
return <tr key={label}>
<td>
<Trans components={translationComponents}>{label}</Trans>
<IconTooltip text={tooltipTitle} type="tooltip-custom--narrow" />
</td>
<td className="text-right"><strong>{content}</strong></td>
</tr>;
}; | <mask> import Card from '../ui/Card';
<mask> import Tooltip from '../ui/Tooltip';
<mask> import { formatNumber } from '../../helpers/helpers';
<mask>
<mask> const tooltipType = 'tooltip-custom--narrow';
<mask>
<mask> const Counters = (props) => {
<mask> const {
<mask> t,
<mask> interval,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; </s> remove t,
</s> add </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
const Counters = ({ refreshButton, subtitle }) => { | <mask> import { formatNumber } from '../../helpers/helpers';
<mask>
<mask> const tooltipType = 'tooltip-custom--narrow';
<mask>
<mask> const Counters = (props) => {
<mask> const {
<mask> t,
<mask> interval,
<mask> refreshButton,
<mask> subtitle,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove t,
</s> add </s> remove const tooltipType = 'tooltip-custom--narrow';
</s> add return <tr key={label}>
<td>
<Trans components={translationComponents}>{label}</Trans>
<IconTooltip text={tooltipTitle} type="tooltip-custom--narrow" />
</td>
<td className="text-right"><strong>{content}</strong></td>
</tr>;
}; </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
<mask> const tooltipType = 'tooltip-custom--narrow';
<mask>
<mask> const Counters = (props) => {
<mask> const {
<mask> t,
<mask> interval,
<mask> refreshButton,
<mask> subtitle,
<mask> dnsQueries,
<mask> blockedFiltering,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, </s> remove const tooltipType = 'tooltip-custom--narrow';
</s> add return <tr key={label}>
<td>
<Trans components={translationComponents}>{label}</Trans>
<IconTooltip text={tooltipTitle} type="tooltip-custom--narrow" />
</td>
<td className="text-right"><strong>{content}</strong></td>
</tr>;
}; </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor}
search={row.original.domain} />; </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js | |
numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, | <mask> const Counters = (props) => {
<mask> const {
<mask> t,
<mask> interval,
<mask> refreshButton,
<mask> subtitle,
<mask> dnsQueries,
<mask> blockedFiltering,
<mask> replacedSafebrowsing,
<mask> replacedParental,
<mask> replacedSafesearch,
<mask> avgProcessingTime,
<mask> } = props;
<mask>
<mask> const tooltipTitle = interval === 1
<mask> ? t('number_of_dns_query_24_hours')
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); </s> remove t,
</s> add </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor}
search={row.original.domain} />; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
} = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); | <mask> replacedSafebrowsing,
<mask> replacedParental,
<mask> replacedSafesearch,
<mask> avgProcessingTime,
<mask> } = props;
<mask>
<mask> const tooltipTitle = interval === 1
<mask> ? t('number_of_dns_query_24_hours')
<mask> : t('number_of_dns_query_days', { count: interval });
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; </s> remove const isActivePage = Object.values(URLS).some((item) => item === pathname);
</s> add const isActivePage = Object.values(URLS)
.some((item) => item === pathname); </s> remove const className = classNames('text-truncate key-colon o-hidden', {
</s> add const className = classNames('text-truncate o-hidden', { </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; | <mask> replacedSafesearch,
<mask> avgProcessingTime,
<mask> } = props;
<mask>
<mask> const tooltipTitle = interval === 1
<mask> ? t('number_of_dns_query_24_hours')
<mask> : t('number_of_dns_query_days', { count: interval });
<mask>
<mask> return (
<mask> <Card
<mask> title={t('general_statistics')}
<mask> subtitle={subtitle}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, </s> remove const isActivePage = Object.values(URLS).some((item) => item === pathname);
</s> add const isActivePage = Object.values(URLS)
.some((item) => item === pathname); </s> remove const className = classNames('text-truncate key-colon o-hidden', {
</s> add const className = classNames('text-truncate o-hidden', { </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
<tbody>{rows.map(Row)}</tbody> | <mask> bodyType="card-table"
<mask> refresh={refreshButton}
<mask> >
<mask> <table className="table card-table">
<mask> <tbody>
<mask> <tr>
<mask> <td>
<mask> <Trans>dns_query</Trans>
<mask> <Tooltip text={tooltipTitle} type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {formatNumber(dnsQueries)}
<mask> </span>
<mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans components={[<a href="#filters" key="0">link</a>]}>
<mask> blocked_by
<mask> </Trans>
<mask> <Tooltip
<mask> text={t('number_of_dns_query_blocked_24_hours')}
<mask> type={tooltipType}
<mask> />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {formatNumber(blockedFiltering)}
<mask> </span>
<mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>stats_malware_phishing</Trans>
<mask> <Tooltip
<mask> text={t('number_of_dns_query_blocked_24_hours_by_sec')}
<mask> type={tooltipType}
<mask> />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {formatNumber(replacedSafebrowsing)}
<mask> </span>
<mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>stats_adult</Trans>
<mask> <Tooltip
<mask> text={t('number_of_dns_query_blocked_24_hours_adult')}
<mask> type={tooltipType}
<mask> />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {formatNumber(replacedParental)}
<mask> </span>
<mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>enforced_save_search</Trans>
<mask> <Tooltip
<mask> text={t('number_of_dns_query_to_safe_search')}
<mask> type={tooltipType}
<mask> />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {formatNumber(replacedSafesearch)}
<mask> </span>
<mask> </td>
<mask> </tr>
<mask> <tr>
<mask> <td>
<mask> <Trans>average_processing_time</Trans>
<mask> <Tooltip text={t('average_processing_time_hint')} type={tooltipType} />
<mask> </td>
<mask> <td className="text-right">
<mask> <span className="text-muted">
<mask> {avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0}
<mask> </span>
<mask> </td>
<mask> </tr>
<mask> </tbody>
<mask> </table>
<mask> </Card>
<mask> );
<mask> };
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const tooltipType = 'tooltip-custom--narrow';
</s> add return <tr key={label}>
<td>
<Trans components={translationComponents}>{label}</Trans>
<IconTooltip text={tooltipTitle} type="tooltip-custom--narrow" />
</td>
<td className="text-right"><strong>{content}</strong></td>
</tr>;
}; </s> remove {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; </s> remove }) => <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder} />
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<Tooltip text={tooltip} type='tooltip-custom--logs' />
</s> add onKeyDown,
normalizeOnBlur,
}) => {
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
return <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder}
onKeyDown={onKeyDown}
onBlur={onBlur}
/>
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<IconTooltip text={tooltip} type='tooltip-custom--logs' /> </s> remove />
</s> add /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
Row.propTypes = {
label: propTypes.string.isRequired,
count: propTypes.string.isRequired,
response_status: propTypes.string,
tooltipTitle: propTypes.string.isRequired,
translationComponents: propTypes.arrayOf(propTypes.element),
};
| <mask> </Card>
<mask> );
<mask> };
<mask>
<mask> Counters.propTypes = {
<mask> refreshButton: propTypes.node.isRequired,
<mask> subtitle: propTypes.string.isRequired,
<mask> };
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove dnsQueries: PropTypes.number.isRequired,
blockedFiltering: PropTypes.number.isRequired,
replacedSafebrowsing: PropTypes.number.isRequired,
replacedParental: PropTypes.number.isRequired,
replacedSafesearch: PropTypes.number.isRequired,
avgProcessingTime: PropTypes.number.isRequired,
refreshButton: PropTypes.node.isRequired,
subtitle: PropTypes.string.isRequired,
interval: PropTypes.number.isRequired,
t: PropTypes.func.isRequired,
</s> add refreshButton: propTypes.node.isRequired,
subtitle: propTypes.string.isRequired, </s> remove );
};
</s> add ); </s> remove />
</s> add /> </s> remove handleChange: PropTypes.func,
</s> add </s> remove options.map((option) => ({ value: option, label: option }))
</s> add options.map((option) => ({
value: option,
label: option,
})) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
refreshButton: propTypes.node.isRequired,
subtitle: propTypes.string.isRequired, | <mask> );
<mask> };
<mask>
<mask> Counters.propTypes = {
<mask> dnsQueries: PropTypes.number.isRequired,
<mask> blockedFiltering: PropTypes.number.isRequired,
<mask> replacedSafebrowsing: PropTypes.number.isRequired,
<mask> replacedParental: PropTypes.number.isRequired,
<mask> replacedSafesearch: PropTypes.number.isRequired,
<mask> avgProcessingTime: PropTypes.number.isRequired,
<mask> refreshButton: PropTypes.node.isRequired,
<mask> subtitle: PropTypes.string.isRequired,
<mask> interval: PropTypes.number.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withTranslation()(Counters);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove export default withTranslation()(Counters);
</s> add export default Counters; </s> remove );
</s> add </div>; </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
export default Counters; | <mask> interval: PropTypes.number.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withTranslation()(Counters);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove dnsQueries: PropTypes.number.isRequired,
blockedFiltering: PropTypes.number.isRequired,
replacedSafebrowsing: PropTypes.number.isRequired,
replacedParental: PropTypes.number.isRequired,
replacedSafesearch: PropTypes.number.isRequired,
avgProcessingTime: PropTypes.number.isRequired,
refreshButton: PropTypes.node.isRequired,
subtitle: PropTypes.string.isRequired,
interval: PropTypes.number.isRequired,
t: PropTypes.func.isRequired,
</s> add refreshButton: propTypes.node.isRequired,
subtitle: propTypes.string.isRequired, </s> remove submit: PropTypes.func.isRequired,
reset: PropTypes.func.isRequired,
</s> add change: PropTypes.func.isRequired, </s> remove setLogsFilter,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/Counters.js |
}
if (percent > 5) { | <mask>
<mask> const getQueriedPercentColor = (percent) => {
<mask> if (percent > 10) {
<mask> return STATUS_COLORS.red;
<mask> } if (percent > 5) {
<mask> return STATUS_COLORS.yellow;
<mask> }
<mask> return STATUS_COLORS.green;
<mask> };
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const additionalLogs = await getLogsWithParams({ older_than: oldest, filter });
</s> add const additionalLogs = await getLogsWithParams({
older_than: oldest,
filter,
}); </s> remove useEffect(() => {
mediaQuery.addListener(mediaQueryHandler);
return () => mediaQuery.removeListener(mediaQueryHandler);
}, []);
</s> add </s> remove const INITIAL_REQUEST = true;
const INITIAL_REQUEST_DATA = ['', TABLE_FIRST_PAGE, INITIAL_REQUEST];
</s> add </s> remove useEffect(() => clearInput, []);
</s> add const onEnterPress = (e) => {
if (e.key === 'Enter') {
setDebouncedSearch(search);
}
};
const normalizeOnBlur = (data) => data.trim(); </s> remove const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
</s> add const rawLogs = await apiClient.getQueryLog({
...filter,
older_than,
}); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/QueriedDomains.js |
return <Cell value={value} percent={percent} color={percentColor}
search={row.original.domain} />; | <mask> const { value } = row;
<mask> const percent = getPercent(dnsQueries, value);
<mask> const percentColor = getQueriedPercentColor(percent);
<mask>
<mask> return <Cell value={value} percent={percent} color={percentColor} />;
<mask> };
<mask>
<mask> const QueriedDomains = ({
<mask> t, refreshButton, topQueriedDomains, subtitle, dnsQueries,
<mask> }) => (
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor} search={row.original.ip} />; </s> remove return <Cell value={value} percent={percent} color={STATUS_COLORS.red} />;
</s> add return <Cell value={value}
percent={percent}
color={STATUS_COLORS.red}
search={row.original.domain}
/>; </s> remove const Counters = (props) => {
</s> add const Counters = ({ refreshButton, subtitle }) => { </s> remove t,
</s> add </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/QueriedDomains.js |
<mask> </div>
<mask> <div className="col-lg-6">
<mask> <Counters
<mask> subtitle={subtitle}
<mask> interval={stats.interval}
<mask> dnsQueries={stats.numDnsQueries}
<mask> blockedFiltering={stats.numBlockedFiltering}
<mask> replacedSafebrowsing={stats.numReplacedSafebrowsing}
<mask> replacedParental={stats.numReplacedParental}
<mask> replacedSafesearch={stats.numReplacedSafesearch}
<mask> avgProcessingTime={stats.avgProcessingTime}
<mask> refreshButton={refreshButton}
<mask> />
<mask> </div>
<mask> <div className="col-lg-6">
<mask> <Clients
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> </s> remove {clientStats}
</s> add <LogsSearchLink search={row.original.ip}>
{clientStats}
</LogsSearchLink> </s> remove }) => <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder} />
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<Tooltip text={tooltip} type='tooltip-custom--logs' />
</s> add onKeyDown,
normalizeOnBlur,
}) => {
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
return <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder}
onKeyDown={onKeyDown}
onBlur={onBlur}
/>
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<IconTooltip text={tooltip} type='tooltip-custom--logs' /> </s> remove );
</s> add </div>; </s> remove />
</s> add /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Dashboard/index.js | |
import React, { Component } from 'react'; | <mask> import React, { Component, Fragment } from 'react';
<mask> import { NavLink } from 'react-router-dom';
<mask> import PropTypes from 'prop-types';
<mask> import enhanceWithClickOutside from 'react-click-outside';
<mask> import classnames from 'classnames';
<mask> import { Trans, withTranslation } from 'react-i18next';
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import { useDispatch } from 'react-redux';
</s> add | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
route: MENU_URLS.root,
exact: true,
icon: 'dashboard',
text: 'dashboard',
order: 0, | <mask> import Dropdown from '../ui/Dropdown';
<mask>
<mask> const MENU_ITEMS = [
<mask> {
<mask> route: MENU_URLS.root, exact: true, icon: 'dashboard', text: 'dashboard', order: 0,
<mask> },
<mask>
<mask> // Settings dropdown should have visual order 1
<mask>
<mask> // Filters dropdown should have visual order 2
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
</s> add route: MENU_URLS.logs,
icon: 'log',
text: 'query_log',
order: 3, </s> remove route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
</s> add route: MENU_URLS.guide,
icon: 'setup',
text: 'setup_guide',
order: 4, </s> remove { route: SETTINGS_URLS.settings, text: 'general_settings' },
{ route: SETTINGS_URLS.dns, text: 'dns_settings' },
{ route: SETTINGS_URLS.encryption, text: 'encryption_settings' },
{ route: SETTINGS_URLS.clients, text: 'client_settings' },
{ route: SETTINGS_URLS.dhcp, text: 'dhcp_settings' },
</s> add {
route: SETTINGS_URLS.settings,
text: 'general_settings',
},
{
route: SETTINGS_URLS.dns,
text: 'dns_settings',
},
{
route: SETTINGS_URLS.encryption,
text: 'encryption_settings',
},
{
route: SETTINGS_URLS.clients,
text: 'client_settings',
},
{
route: SETTINGS_URLS.dhcp,
text: 'dhcp_settings',
}, </s> remove { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
{ route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
{ route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
{ route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
</s> add {
route: FILTERS_URLS.dns_blocklists,
text: 'dns_blocklists',
},
{
route: FILTERS_URLS.dns_allowlists,
text: 'dns_allowlists',
},
{
route: FILTERS_URLS.dns_rewrites,
text: 'dns_rewrites',
},
{
route: FILTERS_URLS.blocked_services,
text: 'blocked_services',
},
{
route: FILTERS_URLS.custom_rules,
text: 'custom_filtering_rules',
}, </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
route: MENU_URLS.logs,
icon: 'log',
text: 'query_log',
order: 3, | <mask>
<mask> // Filters dropdown should have visual order 2
<mask>
<mask> {
<mask> route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
<mask> },
<mask> {
<mask> route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
<mask> },
<mask> ];
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
</s> add route: MENU_URLS.guide,
icon: 'setup',
text: 'setup_guide',
order: 4, </s> remove route: MENU_URLS.root, exact: true, icon: 'dashboard', text: 'dashboard', order: 0,
</s> add route: MENU_URLS.root,
exact: true,
icon: 'dashboard',
text: 'dashboard',
order: 0, </s> remove { route: SETTINGS_URLS.settings, text: 'general_settings' },
{ route: SETTINGS_URLS.dns, text: 'dns_settings' },
{ route: SETTINGS_URLS.encryption, text: 'encryption_settings' },
{ route: SETTINGS_URLS.clients, text: 'client_settings' },
{ route: SETTINGS_URLS.dhcp, text: 'dhcp_settings' },
</s> add {
route: SETTINGS_URLS.settings,
text: 'general_settings',
},
{
route: SETTINGS_URLS.dns,
text: 'dns_settings',
},
{
route: SETTINGS_URLS.encryption,
text: 'encryption_settings',
},
{
route: SETTINGS_URLS.clients,
text: 'client_settings',
},
{
route: SETTINGS_URLS.dhcp,
text: 'dhcp_settings',
}, </s> remove { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
{ route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
{ route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
{ route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
</s> add {
route: FILTERS_URLS.dns_blocklists,
text: 'dns_blocklists',
},
{
route: FILTERS_URLS.dns_allowlists,
text: 'dns_allowlists',
},
{
route: FILTERS_URLS.dns_rewrites,
text: 'dns_rewrites',
},
{
route: FILTERS_URLS.blocked_services,
text: 'blocked_services',
},
{
route: FILTERS_URLS.custom_rules,
text: 'custom_filtering_rules',
}, </s> remove {this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</s> add <li className="nav-item order-1">
{this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
</li>
<li className="nav-item order-2">
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</li> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
route: MENU_URLS.guide,
icon: 'setup',
text: 'setup_guide',
order: 4, | <mask> {
<mask> route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
<mask> },
<mask> {
<mask> route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
<mask> },
<mask> ];
<mask>
<mask> const SETTINGS_ITEMS = [
<mask> { route: SETTINGS_URLS.settings, text: 'general_settings' },
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
</s> add route: MENU_URLS.logs,
icon: 'log',
text: 'query_log',
order: 3, </s> remove { route: SETTINGS_URLS.settings, text: 'general_settings' },
{ route: SETTINGS_URLS.dns, text: 'dns_settings' },
{ route: SETTINGS_URLS.encryption, text: 'encryption_settings' },
{ route: SETTINGS_URLS.clients, text: 'client_settings' },
{ route: SETTINGS_URLS.dhcp, text: 'dhcp_settings' },
</s> add {
route: SETTINGS_URLS.settings,
text: 'general_settings',
},
{
route: SETTINGS_URLS.dns,
text: 'dns_settings',
},
{
route: SETTINGS_URLS.encryption,
text: 'encryption_settings',
},
{
route: SETTINGS_URLS.clients,
text: 'client_settings',
},
{
route: SETTINGS_URLS.dhcp,
text: 'dhcp_settings',
}, </s> remove { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
{ route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
{ route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
{ route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
</s> add {
route: FILTERS_URLS.dns_blocklists,
text: 'dns_blocklists',
},
{
route: FILTERS_URLS.dns_allowlists,
text: 'dns_allowlists',
},
{
route: FILTERS_URLS.dns_rewrites,
text: 'dns_rewrites',
},
{
route: FILTERS_URLS.blocked_services,
text: 'blocked_services',
},
{
route: FILTERS_URLS.custom_rules,
text: 'custom_filtering_rules',
}, </s> remove route: MENU_URLS.root, exact: true, icon: 'dashboard', text: 'dashboard', order: 0,
</s> add route: MENU_URLS.root,
exact: true,
icon: 'dashboard',
text: 'dashboard',
order: 0, </s> remove {this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</s> add <li className="nav-item order-1">
{this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
</li>
<li className="nav-item order-2">
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</li> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
{
route: SETTINGS_URLS.settings,
text: 'general_settings',
},
{
route: SETTINGS_URLS.dns,
text: 'dns_settings',
},
{
route: SETTINGS_URLS.encryption,
text: 'encryption_settings',
},
{
route: SETTINGS_URLS.clients,
text: 'client_settings',
},
{
route: SETTINGS_URLS.dhcp,
text: 'dhcp_settings',
}, | <mask> },
<mask> ];
<mask>
<mask> const SETTINGS_ITEMS = [
<mask> { route: SETTINGS_URLS.settings, text: 'general_settings' },
<mask> { route: SETTINGS_URLS.dns, text: 'dns_settings' },
<mask> { route: SETTINGS_URLS.encryption, text: 'encryption_settings' },
<mask> { route: SETTINGS_URLS.clients, text: 'client_settings' },
<mask> { route: SETTINGS_URLS.dhcp, text: 'dhcp_settings' },
<mask> ];
<mask>
<mask> const FILTERS_ITEMS = [
<mask> { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
<mask> { route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
{ route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
{ route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
{ route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
</s> add {
route: FILTERS_URLS.dns_blocklists,
text: 'dns_blocklists',
},
{
route: FILTERS_URLS.dns_allowlists,
text: 'dns_allowlists',
},
{
route: FILTERS_URLS.dns_rewrites,
text: 'dns_rewrites',
},
{
route: FILTERS_URLS.blocked_services,
text: 'blocked_services',
},
{
route: FILTERS_URLS.custom_rules,
text: 'custom_filtering_rules',
}, </s> remove route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
</s> add route: MENU_URLS.guide,
icon: 'setup',
text: 'setup_guide',
order: 4, </s> remove route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
</s> add route: MENU_URLS.logs,
icon: 'log',
text: 'query_log',
order: 3, </s> remove route: MENU_URLS.root, exact: true, icon: 'dashboard', text: 'dashboard', order: 0,
</s> add route: MENU_URLS.root,
exact: true,
icon: 'dashboard',
text: 'dashboard',
order: 0, </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
{
route: FILTERS_URLS.dns_blocklists,
text: 'dns_blocklists',
},
{
route: FILTERS_URLS.dns_allowlists,
text: 'dns_allowlists',
},
{
route: FILTERS_URLS.dns_rewrites,
text: 'dns_rewrites',
},
{
route: FILTERS_URLS.blocked_services,
text: 'blocked_services',
},
{
route: FILTERS_URLS.custom_rules,
text: 'custom_filtering_rules',
}, | <mask> { route: SETTINGS_URLS.dhcp, text: 'dhcp_settings' },
<mask> ];
<mask>
<mask> const FILTERS_ITEMS = [
<mask> { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
<mask> { route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
<mask> { route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
<mask> { route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
<mask> { route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
<mask> ];
<mask>
<mask> class Menu extends Component {
<mask> handleClickOutside = () => {
<mask> this.props.closeMenu();
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove { route: SETTINGS_URLS.settings, text: 'general_settings' },
{ route: SETTINGS_URLS.dns, text: 'dns_settings' },
{ route: SETTINGS_URLS.encryption, text: 'encryption_settings' },
{ route: SETTINGS_URLS.clients, text: 'client_settings' },
{ route: SETTINGS_URLS.dhcp, text: 'dhcp_settings' },
</s> add {
route: SETTINGS_URLS.settings,
text: 'general_settings',
},
{
route: SETTINGS_URLS.dns,
text: 'dns_settings',
},
{
route: SETTINGS_URLS.encryption,
text: 'encryption_settings',
},
{
route: SETTINGS_URLS.clients,
text: 'client_settings',
},
{
route: SETTINGS_URLS.dhcp,
text: 'dhcp_settings',
}, </s> remove route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
</s> add route: MENU_URLS.guide,
icon: 'setup',
text: 'setup_guide',
order: 4, </s> remove route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
</s> add route: MENU_URLS.logs,
icon: 'log',
text: 'query_log',
order: 3, </s> remove route: MENU_URLS.root, exact: true, icon: 'dashboard', text: 'dashboard', order: 0,
</s> add route: MENU_URLS.root,
exact: true,
icon: 'dashboard',
text: 'dashboard',
order: 0, </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
const isActivePage = Object.values(URLS)
.some((item) => item === pathname); | <mask> };
<mask>
<mask> getActiveClassForDropdown = (URLS) => {
<mask> const { pathname } = this.props.location;
<mask> const isActivePage = Object.values(URLS).some((item) => item === pathname);
<mask>
<mask> return isActivePage ? 'active' : '';
<mask> };
<mask>
<mask> getNavLink = ({
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const className = classNames('text-truncate key-colon o-hidden', {
</s> add const className = classNames('text-truncate o-hidden', { </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor} search={row.original.ip} />; </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); </s> remove return <Cell value={value} percent={percent} color={STATUS_COLORS.red} />;
</s> add return <Cell value={value}
percent={percent}
color={STATUS_COLORS.red}
search={row.original.domain}
/>; </s> remove useEffect(() => clearInput, []);
</s> add const onEnterPress = (e) => {
if (e.key === 'Enter') {
setDebouncedSearch(search);
}
};
const normalizeOnBlur = (data) => data.trim(); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
<Dropdown
label={this.props.t(label)}
baseClassName='dropdown'
controlClassName={`nav-link ${this.getActiveClassForDropdown(URLS)}`}
icon={icon}>
{ITEMS.map((item) => (
this.getNavLink({
...item,
order,
className: 'dropdown-item',
})))}
</Dropdown> | <mask>
<mask> getDropdown = ({
<mask> label, order, URLS, icon, ITEMS,
<mask> }) => (
<mask> <Dropdown
<mask> label={this.props.t(label)}
<mask> baseClassName={`dropdown nav-item order-${order}`}
<mask> controlClassName={`nav-link ${this.getActiveClassForDropdown(URLS)}`}
<mask> icon={icon}>
<mask> {ITEMS.map((item) => (
<mask> this.getNavLink({
<mask> ...item,
<mask> order,
<mask> className: 'dropdown-item',
<mask> })))}
<mask> </Dropdown>
<mask> );
<mask>
<mask> render() {
<mask> const menuClass = classnames({
<mask> 'header__column mobile-menu': true,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove <Fragment>
</s> add <> </s> remove const Filters = ({ filter, refreshLogs, setIsLoading }) => {
const dispatch = useDispatch();
const onSubmit = async (values) => {
setIsLoading(true);
await dispatch(setLogsFilter(values));
setIsLoading(false);
};
return (
</s> add const Filters = ({ filter, refreshLogs, setIsLoading }) => ( </s> remove options.map((option) => ({ value: option, label: option }))
</s> add options.map((option) => ({
value: option,
label: option,
})) </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor}
search={row.original.domain} />; </s> remove
</s> add import LogsSearchLink from './LogsSearchLink'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
<> | <mask> 'header__column mobile-menu': true,
<mask> 'mobile-menu--active': this.props.isMenuOpen,
<mask> });
<mask> return (
<mask> <Fragment>
<mask> <div className={menuClass}>
<mask> <ul className="nav nav-tabs border-0 flex-column flex-lg-row flex-nowrap">
<mask> {MENU_ITEMS.map((item) => (
<mask> <li
<mask> className={`nav-item order-${item.order}`}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove <Dropdown
label={this.props.t(label)}
baseClassName={`dropdown nav-item order-${order}`}
controlClassName={`nav-link ${this.getActiveClassForDropdown(URLS)}`}
icon={icon}>
{ITEMS.map((item) => (
this.getNavLink({
...item,
order,
className: 'dropdown-item',
})))}
</Dropdown>
</s> add <Dropdown
label={this.props.t(label)}
baseClassName='dropdown'
controlClassName={`nav-link ${this.getActiveClassForDropdown(URLS)}`}
icon={icon}>
{ITEMS.map((item) => (
this.getNavLink({
...item,
order,
className: 'dropdown-item',
})))}
</Dropdown> </s> remove <Fragment>
</s> add <> </s> remove {clientStats}
</s> add <LogsSearchLink search={row.original.ip}>
{clientStats}
</LogsSearchLink> </s> remove {this.getNavLink({ ...item, className: 'nav-link' })}
</s> add {this.getNavLink({
...item,
className: 'nav-link',
})} </s> remove filter={filter}
</s> add filter={{
response_status,
search,
}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
{this.getNavLink({
...item,
className: 'nav-link',
})} | <mask> className={`nav-item order-${item.order}`}
<mask> key={item.text}
<mask> onClick={this.closeMenu}
<mask> >
<mask> {this.getNavLink({ ...item, className: 'nav-link' })}
<mask> </li>
<mask> ))}
<mask> {this.getDropdown({
<mask> order: 1,
<mask> label: 'settings',
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove {this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</s> add <li className="nav-item order-1">
{this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
</li>
<li className="nav-item order-2">
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</li> </s> remove <Fragment>
</s> add <> </s> remove <Dropdown
label={this.props.t(label)}
baseClassName={`dropdown nav-item order-${order}`}
controlClassName={`nav-link ${this.getActiveClassForDropdown(URLS)}`}
icon={icon}>
{ITEMS.map((item) => (
this.getNavLink({
...item,
order,
className: 'dropdown-item',
})))}
</Dropdown>
</s> add <Dropdown
label={this.props.t(label)}
baseClassName='dropdown'
controlClassName={`nav-link ${this.getActiveClassForDropdown(URLS)}`}
icon={icon}>
{ITEMS.map((item) => (
this.getNavLink({
...item,
order,
className: 'dropdown-item',
})))}
</Dropdown> </s> remove route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
</s> add route: MENU_URLS.logs,
icon: 'log',
text: 'query_log',
order: 3, </s> remove route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
</s> add route: MENU_URLS.guide,
icon: 'setup',
text: 'setup_guide',
order: 4, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
<li className="nav-item order-1">
{this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
</li>
<li className="nav-item order-2">
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</li> | <mask> >
<mask> {this.getNavLink({ ...item, className: 'nav-link' })}
<mask> </li>
<mask> ))}
<mask> {this.getDropdown({
<mask> order: 1,
<mask> label: 'settings',
<mask> icon: 'settings',
<mask> URLS: SETTINGS_URLS,
<mask> ITEMS: SETTINGS_ITEMS,
<mask> })}
<mask> {this.getDropdown({
<mask> order: 2,
<mask> label: 'filters',
<mask> icon: 'filters',
<mask> URLS: FILTERS_URLS,
<mask> ITEMS: FILTERS_ITEMS,
<mask> })}
<mask> </ul>
<mask> </div>
<mask> </Fragment>
<mask> );
<mask> }
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove {this.getNavLink({ ...item, className: 'nav-link' })}
</s> add {this.getNavLink({
...item,
className: 'nav-link',
})} </s> remove </Fragment>
</s> add </> </s> remove route: MENU_URLS.logs, icon: 'log', text: 'query_log', order: 3,
</s> add route: MENU_URLS.logs,
icon: 'log',
text: 'query_log',
order: 3, </s> remove route: MENU_URLS.guide, icon: 'setup', text: 'setup_guide', order: 4,
</s> add route: MENU_URLS.guide,
icon: 'setup',
text: 'setup_guide',
order: 4, </s> remove route: MENU_URLS.root, exact: true, icon: 'dashboard', text: 'dashboard', order: 0,
</s> add route: MENU_URLS.root,
exact: true,
icon: 'dashboard',
text: 'dashboard',
order: 0, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
</> | <mask> ITEMS: FILTERS_ITEMS,
<mask> })}
<mask> </ul>
<mask> </div>
<mask> </Fragment>
<mask> );
<mask> }
<mask> }
<mask>
<mask> Menu.propTypes = {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove {this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</s> add <li className="nav-item order-1">
{this.getDropdown({
order: 1,
label: 'settings',
icon: 'settings',
URLS: SETTINGS_URLS,
ITEMS: SETTINGS_ITEMS,
})}
</li>
<li className="nav-item order-2">
{this.getDropdown({
order: 2,
label: 'filters',
icon: 'filters',
URLS: FILTERS_URLS,
ITEMS: FILTERS_ITEMS,
})}
</li> </s> remove {clientStats}
</s> add <LogsSearchLink search={row.original.ip}>
{clientStats}
</LogsSearchLink> </s> remove );
</s> add </div>; </s> remove );
};
</s> add ); </s> remove />
</s> add /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Header/Menu.js |
const lockIconClass = classNames('icons icon--small d-none d-sm-block cursor--pointer', { | <mask> } = row.original;
<mask>
<mask> const hasTracker = !!tracker;
<mask>
<mask> const lockIconClass = classNames('icons', 'icon--small', 'd-none', 'd-sm-block', 'cursor--pointer', {
<mask> 'icon--active': answer_dnssec,
<mask> 'icon--disabled': !answer_dnssec,
<mask> 'my-3': isDetailed,
<mask> });
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const privacyIconClass = classNames('icons', 'mx-2', 'icon--small', 'd-none', 'd-sm-block', 'cursor--pointer', {
</s> add const privacyIconClass = classNames('icons mx-2 icon--small d-none d-sm-block cursor--pointer', { </s> remove const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
</s> add const rawLogs = await apiClient.getQueryLog({
...filter,
older_than,
}); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove export const setLogsFilterFailure = createAction('SET_LOGS_FILTER_FAILURE');
export const setLogsFilterSuccess = createAction('SET_LOGS_FILTER_SUCCESS');
</s> add </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Cells/getDomainCell.js |
const privacyIconClass = classNames('icons mx-2 icon--small d-none d-sm-block cursor--pointer', { | <mask> 'icon--disabled': !answer_dnssec,
<mask> 'my-3': isDetailed,
<mask> });
<mask>
<mask> const privacyIconClass = classNames('icons', 'mx-2', 'icon--small', 'd-none', 'd-sm-block', 'cursor--pointer', {
<mask> 'icon--active': hasTracker,
<mask> 'icon--disabled': !hasTracker,
<mask> 'my-3': isDetailed,
<mask> });
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const lockIconClass = classNames('icons', 'icon--small', 'd-none', 'd-sm-block', 'cursor--pointer', {
</s> add const lockIconClass = classNames('icons icon--small d-none d-sm-block cursor--pointer', { </s> remove const additionalLogs = await getLogsWithParams({ older_than: oldest, filter });
</s> add const additionalLogs = await getLogsWithParams({
older_than: oldest,
filter,
}); </s> remove const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
</s> add const rawLogs = await apiClient.getQueryLog({
...filter,
older_than,
}); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); </s> remove const data = await getLogsWithParams({ older_than: '', filter });
</s> add const data = await getLogsWithParams({
older_than: '',
filter,
}); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Cells/getDomainCell.js |
const className = classNames('text-truncate o-hidden', { | <mask> };
<mask>
<mask> const renderGrid = (content, idx) => {
<mask> const preparedContent = typeof content === 'string' ? t(content) : content;
<mask> const className = classNames('text-truncate key-colon o-hidden', {
<mask> 'overflow-break': preparedContent.length > 100,
<mask> });
<mask> return <div key={idx} className={className}>{preparedContent}</div>;
<mask> };
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const isActivePage = Object.values(URLS).some((item) => item === pathname);
</s> add const isActivePage = Object.values(URLS)
.some((item) => item === pathname); </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor} search={row.original.ip} />; </s> remove Cell: CellWrap,
</s> add Cell: (row) => {
const content = CellWrap(row);
if (!row.value) {
return content;
}
return <LogsSearchLink search={row.original.ids[0]}>{content}</LogsSearchLink>;
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Cells/getDomainCell.js |
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; | <mask> import React, { useEffect } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { useTranslation } from 'react-i18next';
<mask> import debounce from 'lodash/debounce';
<mask> import { useDispatch } from 'react-redux';
<mask> import classNames from 'classnames';
<mask> import {
<mask> DEBOUNCE_FILTER_TIMEOUT,
<mask> DEFAULT_LOGS_FILTER,
<mask> FORM_NAME,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
RESPONSE_FILTER_QUERIES, | <mask> FORM_NAME,
<mask> RESPONSE_FILTER,
<mask> } from '../../../helpers/constants';
<mask> import IconTooltip from '../../ui/IconTooltip';
<mask> import { setLogsFilter } from '../../../actions/queryLogs';
<mask> import useDebounce from '../../../helpers/useDebounce';
<mask> import { createOnBlurHandler, getLogsUrlParams } from '../../../helpers/helpers';
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import Tooltip from '../../ui/Tooltip';
</s> add import IconTooltip from '../../ui/IconTooltip'; </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
import IconTooltip from '../../ui/IconTooltip'; | <mask> DEFAULT_LOGS_FILTER,
<mask> FORM_NAME,
<mask> RESPONSE_FILTER,
<mask> } from '../../../helpers/constants';
<mask> import Tooltip from '../../ui/Tooltip';
<mask> import { setLogsFilter } from '../../../actions/queryLogs';
<mask>
<mask> const renderFilterField = ({
<mask> input,
<mask> id,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
import useDebounce from '../../../helpers/useDebounce';
import { createOnBlurHandler, getLogsUrlParams } from '../../../helpers/helpers'; | <mask> RESPONSE_FILTER_QUERIES,
<mask> } from '../../../helpers/constants';
<mask> import IconTooltip from '../../ui/IconTooltip';
<mask> import { setLogsFilter } from '../../../actions/queryLogs';
<mask>
<mask> const renderFilterField = ({
<mask> input,
<mask> id,
<mask> className,
<mask> placeholder,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import Tooltip from '../../ui/Tooltip';
</s> add import IconTooltip from '../../ui/IconTooltip'; </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
onKeyDown,
normalizeOnBlur,
}) => {
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
return <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder}
onKeyDown={onKeyDown}
onBlur={onBlur}
/>
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<IconTooltip text={tooltip} type='tooltip-custom--logs' /> | <mask> autoComplete,
<mask> tooltip,
<mask> meta: { touched, error },
<mask> onClearInputClick,
<mask> }) => <>
<mask> <div className="input-group-search input-group-search__icon--magnifier">
<mask> <svg className="icons icon--small icon--gray">
<mask> <use xlinkHref="#magnifier" />
<mask> </svg>
<mask> </div>
<mask> <input
<mask> {...input}
<mask> id={id}
<mask> placeholder={placeholder}
<mask> type={type}
<mask> className={className}
<mask> disabled={disabled}
<mask> autoComplete={autoComplete}
<mask> aria-label={placeholder} />
<mask> <div
<mask> className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<mask> <svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<mask> <use xlinkHref="#cross" />
<mask> </svg>
<mask> </div>
<mask> <span className="input-group-search input-group-search__icon--tooltip">
<mask> <Tooltip text={tooltip} type='tooltip-custom--logs' />
<mask> </span>
<mask> {!disabled
<mask> && touched
<mask> && (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </>;
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; </s> remove </Fragment>
</s> add </> </s> remove <tbody>
<tr>
<td>
<Trans>dns_query</Trans>
<Tooltip text={tooltipTitle} type={tooltipType} />
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(dnsQueries)}
</span>
</td>
</tr>
<tr>
<td>
<Trans components={[<a href="#filters" key="0">link</a>]}>
blocked_by
</Trans>
<Tooltip
text={t('number_of_dns_query_blocked_24_hours')}
type={tooltipType}
/>
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(blockedFiltering)}
</span>
</td>
</tr>
<tr>
<td>
<Trans>stats_malware_phishing</Trans>
<Tooltip
text={t('number_of_dns_query_blocked_24_hours_by_sec')}
type={tooltipType}
/>
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(replacedSafebrowsing)}
</span>
</td>
</tr>
<tr>
<td>
<Trans>stats_adult</Trans>
<Tooltip
text={t('number_of_dns_query_blocked_24_hours_adult')}
type={tooltipType}
/>
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(replacedParental)}
</span>
</td>
</tr>
<tr>
<td>
<Trans>enforced_save_search</Trans>
<Tooltip
text={t('number_of_dns_query_to_safe_search')}
type={tooltipType}
/>
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(replacedSafesearch)}
</span>
</td>
</tr>
<tr>
<td>
<Trans>average_processing_time</Trans>
<Tooltip text={t('average_processing_time_hint')} type={tooltipType} />
</td>
<td className="text-right">
<span className="text-muted">
{avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0}
</span>
</td>
</tr>
</tbody>
</s> add <tbody>{rows.map(Row)}</tbody> </s> remove <Route path={MENU_URLS.logs} component={Logs} />
</s> add <Route
path={[`${MENU_URLS.logs}${getLogsUrlParams(':search?', ':response_status?')}`, MENU_URLS.logs]}
component={Logs} /> </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; | <mask> </div>
<mask> <span className="input-group-search input-group-search__icon--tooltip">
<mask> <Tooltip text={tooltip} type='tooltip-custom--logs' />
<mask> </span>
<mask> {!disabled
<mask> && touched
<mask> && (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </>;
<mask>
<mask> renderFilterField.propTypes = {
<mask> input: PropTypes.object.isRequired,
<mask> id: PropTypes.string.isRequired,
<mask> onClearInputClick: PropTypes.func.isRequired,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove }) => <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder} />
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<Tooltip text={tooltip} type='tooltip-custom--logs' />
</s> add onKeyDown,
normalizeOnBlur,
}) => {
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
return <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder}
onKeyDown={onKeyDown}
onBlur={onBlur}
/>
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<IconTooltip text={tooltip} type='tooltip-custom--logs' /> </s> remove <tbody>
<tr>
<td>
<Trans>dns_query</Trans>
<Tooltip text={tooltipTitle} type={tooltipType} />
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(dnsQueries)}
</span>
</td>
</tr>
<tr>
<td>
<Trans components={[<a href="#filters" key="0">link</a>]}>
blocked_by
</Trans>
<Tooltip
text={t('number_of_dns_query_blocked_24_hours')}
type={tooltipType}
/>
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(blockedFiltering)}
</span>
</td>
</tr>
<tr>
<td>
<Trans>stats_malware_phishing</Trans>
<Tooltip
text={t('number_of_dns_query_blocked_24_hours_by_sec')}
type={tooltipType}
/>
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(replacedSafebrowsing)}
</span>
</td>
</tr>
<tr>
<td>
<Trans>stats_adult</Trans>
<Tooltip
text={t('number_of_dns_query_blocked_24_hours_adult')}
type={tooltipType}
/>
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(replacedParental)}
</span>
</td>
</tr>
<tr>
<td>
<Trans>enforced_save_search</Trans>
<Tooltip
text={t('number_of_dns_query_to_safe_search')}
type={tooltipType}
/>
</td>
<td className="text-right">
<span className="text-muted">
{formatNumber(replacedSafesearch)}
</span>
</td>
</tr>
<tr>
<td>
<Trans>average_processing_time</Trans>
<Tooltip text={t('average_processing_time_hint')} type={tooltipType} />
</td>
<td className="text-right">
<span className="text-muted">
{avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0}
</span>
</td>
</tr>
</tbody>
</s> add <tbody>{rows.map(Row)}</tbody> </s> remove </Fragment>
</s> add </> </s> remove );
};
</s> add ); </s> remove <Fragment>
</s> add <> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
onKeyDown: PropTypes.func,
normalizeOnBlur: PropTypes.func, | <mask> disabled: PropTypes.string,
<mask> autoComplete: PropTypes.string,
<mask> tooltip: PropTypes.string,
<mask> meta: PropTypes.shape({
<mask> touched: PropTypes.bool,
<mask> error: PropTypes.object,
<mask> }).isRequired,
<mask> };
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove handleChange: PropTypes.func,
</s> add </s> remove submit: PropTypes.func.isRequired,
reset: PropTypes.func.isRequired,
</s> add change: PropTypes.func.isRequired, </s> remove }) => <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder} />
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<Tooltip text={tooltip} type='tooltip-custom--logs' />
</s> add onKeyDown,
normalizeOnBlur,
}) => {
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
return <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder}
onKeyDown={onKeyDown}
onBlur={onBlur}
/>
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<IconTooltip text={tooltip} type='tooltip-custom--logs' /> | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
const FORM_NAMES = {
search: 'search',
response_status: 'response_status',
};
| <mask> error: PropTypes.object,
<mask> }).isRequired,
<mask> };
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> className = '',
<mask> responseStatusClass,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove submit,
reset,
</s> add </s> remove const className = classNames('text-truncate key-colon o-hidden', {
</s> add const className = classNames('text-truncate o-hidden', { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
<mask> const Form = (props) => {
<mask> const {
<mask> className = '',
<mask> responseStatusClass,
<mask> submit,
<mask> reset,
<mask> setIsLoading,
<mask> } = props;
<mask>
<mask> const { t } = useTranslation();
<mask> const dispatch = useDispatch();
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const [t] = useTranslation();
</s> add const { t } = useTranslation(); </s> remove const debouncedSubmit = debounce(submit, DEBOUNCE_FILTER_TIMEOUT);
const zeroDelaySubmit = () => setTimeout(submit, 0);
</s> add const {
response_status, search,
} = useSelector((state) => state.form[FORM_NAME.LOGS_FILTER].values, shallowEqual); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js | |
change, | <mask> const {
<mask> className = '',
<mask> responseStatusClass,
<mask> setIsLoading,
<mask> } = props;
<mask>
<mask> const { t } = useTranslation();
<mask> const dispatch = useDispatch();
<mask> const history = useHistory();
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove submit,
reset,
</s> add </s> remove const [t] = useTranslation();
</s> add const { t } = useTranslation(); </s> remove const debouncedSubmit = debounce(submit, DEBOUNCE_FILTER_TIMEOUT);
const zeroDelaySubmit = () => setTimeout(submit, 0);
</s> add const {
response_status, search,
} = useSelector((state) => state.form[FORM_NAME.LOGS_FILTER].values, shallowEqual); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
const history = useHistory(); | <mask> } = props;
<mask>
<mask> const { t } = useTranslation();
<mask> const dispatch = useDispatch();
<mask>
<mask> const {
<mask> response_status, search,
<mask> } = useSelector((state) => state.form[FORM_NAME.LOGS_FILTER].values, shallowEqual);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const debouncedSubmit = debounce(submit, DEBOUNCE_FILTER_TIMEOUT);
const zeroDelaySubmit = () => setTimeout(submit, 0);
</s> add const {
response_status, search,
} = useSelector((state) => state.form[FORM_NAME.LOGS_FILTER].values, shallowEqual); </s> remove submit,
reset,
</s> add </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); </s> remove const [t] = useTranslation();
</s> add const { t } = useTranslation(); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
const {
response_status, search,
} = useSelector((state) => state.form[FORM_NAME.LOGS_FILTER].values, shallowEqual); | <mask>
<mask> const { t } = useTranslation();
<mask> const dispatch = useDispatch();
<mask>
<mask> const debouncedSubmit = debounce(submit, DEBOUNCE_FILTER_TIMEOUT);
<mask> const zeroDelaySubmit = () => setTimeout(submit, 0);
<mask>
<mask> const clearInput = async () => {
<mask> await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
<mask> await reset();
<mask> };
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const clearInput = async () => {
await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
await reset();
};
</s> add const [
debouncedSearch,
setDebouncedSearch,
] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
useEffect(() => {
dispatch(setLogsFilter({
response_status,
search: debouncedSearch,
}));
history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
}, [response_status, debouncedSearch]);
if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
} </s> remove submit,
reset,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
const [
debouncedSearch,
setDebouncedSearch,
] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
useEffect(() => {
dispatch(setLogsFilter({
response_status,
search: debouncedSearch,
}));
history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
}, [response_status, debouncedSearch]);
if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
} | <mask>
<mask> const debouncedSubmit = debounce(submit, DEBOUNCE_FILTER_TIMEOUT);
<mask> const zeroDelaySubmit = () => setTimeout(submit, 0);
<mask>
<mask> const clearInput = async () => {
<mask> await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
<mask> await reset();
<mask> };
<mask>
<mask> const onInputClear = async () => {
<mask> setIsLoading(true);
<mask> await clearInput();
<mask> setIsLoading(false);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const debouncedSubmit = debounce(submit, DEBOUNCE_FILTER_TIMEOUT);
const zeroDelaySubmit = () => setTimeout(submit, 0);
</s> add const {
response_status, search,
} = useSelector((state) => state.form[FORM_NAME.LOGS_FILTER].values, shallowEqual); </s> remove await clearInput();
</s> add setDebouncedSearch(DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]); </s> remove getLogs(...INITIAL_REQUEST_DATA),
</s> add dispatch(refreshFilteredLogs()), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
setDebouncedSearch(DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]); | <mask> };
<mask>
<mask> const onInputClear = async () => {
<mask> setIsLoading(true);
<mask> await clearInput();
<mask> setIsLoading(false);
<mask> };
<mask>
<mask> useEffect(() => clearInput, []);
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const clearInput = async () => {
await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
await reset();
};
</s> add const [
debouncedSearch,
setDebouncedSearch,
] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
useEffect(() => {
dispatch(setLogsFilter({
response_status,
search: debouncedSearch,
}));
history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
}, [response_status, debouncedSearch]);
if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
} </s> remove useEffect(() => clearInput, []);
</s> add const onEnterPress = (e) => {
if (e.key === 'Enter') {
setDebouncedSearch(search);
}
};
const normalizeOnBlur = (data) => data.trim(); </s> remove getLogs(...INITIAL_REQUEST_DATA),
</s> add dispatch(refreshFilteredLogs()), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
const onEnterPress = (e) => {
if (e.key === 'Enter') {
setDebouncedSearch(search);
}
};
const normalizeOnBlur = (data) => data.trim(); | <mask> await clearInput();
<mask> setIsLoading(false);
<mask> };
<mask>
<mask> useEffect(() => clearInput, []);
<mask>
<mask> return (
<mask> <form className="d-flex flex-wrap form-control--container"
<mask> onSubmit={(e) => {
<mask> e.preventDefault();
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove zeroDelaySubmit();
debouncedSubmit.cancel();
</s> add </s> remove await clearInput();
</s> add setDebouncedSearch(DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]); </s> remove const clearInput = async () => {
await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
await reset();
};
</s> add const [
debouncedSearch,
setDebouncedSearch,
] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
useEffect(() => {
dispatch(setLogsFilter({
response_status,
search: debouncedSearch,
}));
history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
}, [response_status, debouncedSearch]);
if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
} </s> remove useEffect(() => {
mediaQuery.addListener(mediaQueryHandler);
return () => mediaQuery.removeListener(mediaQueryHandler);
}, []);
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
<mask> return (
<mask> <form className="d-flex flex-wrap form-control--container"
<mask> onSubmit={(e) => {
<mask> e.preventDefault();
<mask> zeroDelaySubmit();
<mask> debouncedSubmit.cancel();
<mask> }}
<mask> >
<mask> <Field
<mask> id="search"
<mask> name="search"
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove useEffect(() => clearInput, []);
</s> add const onEnterPress = (e) => {
if (e.key === 'Enter') {
setDebouncedSearch(search);
}
};
const normalizeOnBlur = (data) => data.trim(); </s> remove id="search"
name="search"
</s> add id={FORM_NAMES.search}
name={FORM_NAMES.search} </s> remove } if (percent > 5) {
</s> add }
if (percent > 5) { </s> remove name="response_status"
</s> add name={FORM_NAMES.response_status} </s> remove onChange={zeroDelaySubmit}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js | |
id={FORM_NAMES.search}
name={FORM_NAMES.search} | <mask> debouncedSubmit.cancel();
<mask> }}
<mask> >
<mask> <Field
<mask> id="search"
<mask> name="search"
<mask> component={renderFilterField}
<mask> type="text"
<mask> className={classNames('form-control--search form-control--transparent', className)}
<mask> placeholder={t('domain_or_client')}
<mask> tooltip={t('query_log_strict_search')}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove onChange={debouncedSubmit}
</s> add </s> remove zeroDelaySubmit();
debouncedSubmit.cancel();
</s> add </s> remove name="response_status"
</s> add name={FORM_NAMES.response_status} </s> remove onChange={zeroDelaySubmit}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
<mask> type="text"
<mask> className={classNames('form-control--search form-control--transparent', className)}
<mask> placeholder={t('domain_or_client')}
<mask> tooltip={t('query_log_strict_search')}
<mask> onChange={debouncedSubmit}
<mask> onClearInputClick={onInputClear}
<mask> />
<mask> <div className="field__select">
<mask> <Field
<mask> name="response_status"
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove id="search"
name="search"
</s> add id={FORM_NAMES.search}
name={FORM_NAMES.search} </s> remove name="response_status"
</s> add name={FORM_NAMES.response_status} </s> remove onChange={zeroDelaySubmit}
</s> add </s> remove interval={stats.interval}
dnsQueries={stats.numDnsQueries}
blockedFiltering={stats.numBlockedFiltering}
replacedSafebrowsing={stats.numReplacedSafebrowsing}
replacedParental={stats.numReplacedParental}
replacedSafesearch={stats.numReplacedSafesearch}
avgProcessingTime={stats.avgProcessingTime}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js | |
onKeyDown={onEnterPress}
normalizeOnBlur={normalizeOnBlur} | <mask> tooltip={t('query_log_strict_search')}
<mask> onClearInputClick={onInputClear}
<mask> />
<mask> <div className="field__select">
<mask> <Field
<mask> name={FORM_NAMES.response_status}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove onChange={debouncedSubmit}
</s> add </s> remove name="response_status"
</s> add name={FORM_NAMES.response_status} </s> remove id="search"
name="search"
</s> add id={FORM_NAMES.search}
name={FORM_NAMES.search} </s> remove interval={stats.interval}
dnsQueries={stats.numDnsQueries}
blockedFiltering={stats.numBlockedFiltering}
replacedSafebrowsing={stats.numReplacedSafebrowsing}
replacedParental={stats.numReplacedParental}
replacedSafesearch={stats.numReplacedSafesearch}
avgProcessingTime={stats.avgProcessingTime}
</s> add </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
name={FORM_NAMES.response_status} | <mask> onClearInputClick={onInputClear}
<mask> />
<mask> <div className="field__select">
<mask> <Field
<mask> name="response_status"
<mask> component="select"
<mask> className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left ml-small form-control--transparent', responseStatusClass)}
<mask> onChange={zeroDelaySubmit}
<mask> >
<mask> {Object.values(RESPONSE_FILTER)
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove onChange={zeroDelaySubmit}
</s> add </s> remove onChange={debouncedSubmit}
</s> add </s> remove id="search"
name="search"
</s> add id={FORM_NAMES.search}
name={FORM_NAMES.search} </s> remove zeroDelaySubmit();
debouncedSubmit.cancel();
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
<mask> <Field
<mask> name="response_status"
<mask> component="select"
<mask> className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left ml-small form-control--transparent', responseStatusClass)}
<mask> onChange={zeroDelaySubmit}
<mask> >
<mask> {Object.values(RESPONSE_FILTER)
<mask> .map(({
<mask> query, label, disabled,
<mask> }) => <option key={label} value={query}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove name="response_status"
</s> add name={FORM_NAMES.response_status} </s> remove onChange={debouncedSubmit}
</s> add </s> remove id="search"
name="search"
</s> add id={FORM_NAMES.search}
name={FORM_NAMES.search} </s> remove zeroDelaySubmit();
debouncedSubmit.cancel();
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js | |
<mask> );
<mask> };
<mask>
<mask> Form.propTypes = {
<mask> handleChange: PropTypes.func,
<mask> className: PropTypes.string,
<mask> responseStatusClass: PropTypes.string,
<mask> submit: PropTypes.func.isRequired,
<mask> reset: PropTypes.func.isRequired,
<mask> setIsLoading: PropTypes.func.isRequired,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove submit: PropTypes.func.isRequired,
reset: PropTypes.func.isRequired,
</s> add change: PropTypes.func.isRequired, </s> remove setLogsFilter: PropTypes.func.isRequired,
</s> add </s> remove );
};
</s> add ); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js | |
change: PropTypes.func.isRequired, | <mask> Form.propTypes = {
<mask> handleChange: PropTypes.func,
<mask> className: PropTypes.string,
<mask> responseStatusClass: PropTypes.string,
<mask> submit: PropTypes.func.isRequired,
<mask> reset: PropTypes.func.isRequired,
<mask> setIsLoading: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default reduxForm({
<mask> form: FORM_NAME.LOGS_FILTER,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove handleChange: PropTypes.func,
</s> add </s> remove export default withTranslation()(Counters);
</s> add export default Counters; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
enableReinitialize: true, | <mask>
<mask> export default reduxForm({
<mask> form: FORM_NAME.LOGS_FILTER,
<mask> })(Form);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove submit: PropTypes.func.isRequired,
reset: PropTypes.func.isRequired,
</s> add change: PropTypes.func.isRequired, </s> remove export default withTranslation()(Counters);
</s> add export default Counters; </s> remove setLogsFilter,
</s> add </s> remove dnsQueries: PropTypes.number.isRequired,
blockedFiltering: PropTypes.number.isRequired,
replacedSafebrowsing: PropTypes.number.isRequired,
replacedParental: PropTypes.number.isRequired,
replacedSafesearch: PropTypes.number.isRequired,
avgProcessingTime: PropTypes.number.isRequired,
refreshButton: PropTypes.node.isRequired,
subtitle: PropTypes.string.isRequired,
interval: PropTypes.number.isRequired,
t: PropTypes.func.isRequired,
</s> add refreshButton: propTypes.node.isRequired,
subtitle: propTypes.string.isRequired, | [
"keep",
"keep",
"add",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/Form.js |
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans } from 'react-i18next';
<mask> import { useDispatch } from 'react-redux';
<mask> import Form from './Form';
<mask> import { setLogsFilter } from '../../../actions/queryLogs';
<mask>
<mask> const Filters = ({ filter, refreshLogs, setIsLoading }) => {
<mask> const dispatch = useDispatch();
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add </s> remove const Filters = ({ filter, refreshLogs, setIsLoading }) => {
const dispatch = useDispatch();
const onSubmit = async (values) => {
setIsLoading(true);
await dispatch(setLogsFilter(values));
setIsLoading(false);
};
return (
</s> add const Filters = ({ filter, refreshLogs, setIsLoading }) => ( </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/index.js | |
<mask> import PropTypes from 'prop-types';
<mask> import { Trans } from 'react-i18next';
<mask> import { useDispatch } from 'react-redux';
<mask> import Form from './Form';
<mask> import { setLogsFilter } from '../../../actions/queryLogs';
<mask>
<mask> const Filters = ({ filter, refreshLogs, setIsLoading }) => {
<mask> const dispatch = useDispatch();
<mask>
<mask> const onSubmit = async (values) => {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove const Filters = ({ filter, refreshLogs, setIsLoading }) => {
const dispatch = useDispatch();
const onSubmit = async (values) => {
setIsLoading(true);
await dispatch(setLogsFilter(values));
setIsLoading(false);
};
return (
</s> add const Filters = ({ filter, refreshLogs, setIsLoading }) => ( </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove BLOCK_ACTIONS, smallScreenSize,
</s> add BLOCK_ACTIONS, </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/index.js | |
const Filters = ({ filter, refreshLogs, setIsLoading }) => ( | <mask> import { useDispatch } from 'react-redux';
<mask> import Form from './Form';
<mask> import { setLogsFilter } from '../../../actions/queryLogs';
<mask>
<mask> const Filters = ({ filter, refreshLogs, setIsLoading }) => {
<mask> const dispatch = useDispatch();
<mask>
<mask> const onSubmit = async (values) => {
<mask> setIsLoading(true);
<mask> await dispatch(setLogsFilter(values));
<mask> setIsLoading(false);
<mask> };
<mask>
<mask> return (
<mask> <div className="page-header page-header--logs">
<mask> <h1 className="page-title page-title--large">
<mask> <Trans>query_log</Trans>
<mask> <button
<mask> type="button"
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove import { TABLE_DEFAULT_PAGE_SIZE, TABLE_FIRST_PAGE } from '../helpers/constants';
</s> add import {
DEFAULT_LOGS_FILTER,
TABLE_DEFAULT_PAGE_SIZE,
TABLE_FIRST_PAGE,
} from '../helpers/constants'; </s> remove import Tooltip from '../../ui/Tooltip';
</s> add import IconTooltip from '../../ui/IconTooltip'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/index.js |
<mask> </h1>
<mask> <Form
<mask> responseStatusClass="d-sm-block"
<mask> initialValues={filter}
<mask> onSubmit={onSubmit}
<mask> setIsLoading={setIsLoading}
<mask> />
<mask> </div>
<mask> );
<mask> };
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove />
</s> add /> </s> remove );
};
</s> add ); </s> remove );
</s> add </div>; </s> remove setLogsFilter={setLogsFilter}
</s> add </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/index.js | |
/> | <mask> responseStatusClass="d-sm-block"
<mask> initialValues={filter}
<mask> onSubmit={onSubmit}
<mask> setIsLoading={setIsLoading}
<mask> />
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> Filters.propTypes = {
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove onSubmit={onSubmit}
</s> add </s> remove );
};
</s> add ); </s> remove );
</s> add </div>; </s> remove </Fragment>
</s> add </> </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/index.js |
); | <mask> onSubmit={onSubmit}
<mask> setIsLoading={setIsLoading}
<mask> />
<mask> </div>
<mask> );
<mask> };
<mask>
<mask> Filters.propTypes = {
<mask> filter: PropTypes.object.isRequired,
<mask> refreshLogs: PropTypes.func.isRequired,
<mask> processingGetLogs: PropTypes.bool.isRequired,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove />
</s> add /> </s> remove onSubmit={onSubmit}
</s> add </s> remove setLogsFilter: PropTypes.func.isRequired,
</s> add </s> remove {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; </s> remove );
</s> add </div>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Filters/index.js |
const { t } = useTranslation(); | <mask> page,
<mask> isLoading,
<mask> } = props;
<mask>
<mask> const [t] = useTranslation();
<mask>
<mask> const toggleBlocking = (type, domain) => {
<mask> const {
<mask> setRules, getFilteringStatus, addSuccessToast,
<mask> } = props;
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove submit,
reset,
</s> add </s> remove } = props;
</s> add } = useSelector((state) => state.stats, shallowEqual);
const { t } = useTranslation(); </s> remove refreshButton,
subtitle,
dnsQueries,
blockedFiltering,
replacedSafebrowsing,
replacedParental,
replacedSafesearch,
</s> add numDnsQueries,
numBlockedFiltering,
numReplacedSafebrowsing,
numReplacedParental,
numReplacedSafesearch, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Table.js |
loading={isLoading || processingGetLogs} | <mask> filterable={false}
<mask> sortable={false}
<mask> resizable={false}
<mask> data={logs || []}
<mask> loading={isLoading}
<mask> showPageJump={false}
<mask> showPageSizeOptions={false}
<mask> onPageChange={changePage}
<mask> className={tableClass}
<mask> defaultPageSize={TABLE_DEFAULT_PAGE_SIZE}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove Cell: CellWrap,
</s> add Cell: (row) => {
const content = CellWrap(row);
if (!row.value) {
return content;
}
return <LogsSearchLink search={row.original.ids[0]}>{content}</LogsSearchLink>;
}, </s> remove dnsQueries: PropTypes.number.isRequired,
blockedFiltering: PropTypes.number.isRequired,
replacedSafebrowsing: PropTypes.number.isRequired,
replacedParental: PropTypes.number.isRequired,
replacedSafesearch: PropTypes.number.isRequired,
avgProcessingTime: PropTypes.number.isRequired,
refreshButton: PropTypes.node.isRequired,
subtitle: PropTypes.string.isRequired,
interval: PropTypes.number.isRequired,
t: PropTypes.func.isRequired,
</s> add refreshButton: propTypes.node.isRequired,
subtitle: propTypes.string.isRequired, </s> remove interval={stats.interval}
dnsQueries={stats.numDnsQueries}
blockedFiltering={stats.numBlockedFiltering}
replacedSafebrowsing={stats.numReplacedSafebrowsing}
replacedParental={stats.numReplacedParental}
replacedSafesearch={stats.numReplacedSafesearch}
avgProcessingTime={stats.avgProcessingTime}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/Table.js |
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; | <mask> import React, { Fragment, useEffect, useState } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans } from 'react-i18next';
<mask> import Modal from 'react-modal';
<mask> import { useDispatch } from 'react-redux';
<mask> import {
<mask> BLOCK_ACTIONS, smallScreenSize,
<mask> TABLE_DEFAULT_PAGE_SIZE,
<mask> TABLE_FIRST_PAGE,
<mask> } from '../../helpers/constants';
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove BLOCK_ACTIONS, smallScreenSize,
</s> add BLOCK_ACTIONS, </s> remove import debounce from 'lodash/debounce';
import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
BLOCK_ACTIONS, | <mask> import { Trans } from 'react-i18next';
<mask> import Modal from 'react-modal';
<mask> import { useDispatch } from 'react-redux';
<mask> import {
<mask> BLOCK_ACTIONS, smallScreenSize,
<mask> TABLE_DEFAULT_PAGE_SIZE,
<mask> TABLE_FIRST_PAGE,
<mask> } from '../../helpers/constants';
<mask> import Loading from '../ui/Loading';
<mask> import Filters from './Filters';
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
smallScreenSize, | <mask> TABLE_DEFAULT_PAGE_SIZE,
<mask> TABLE_FIRST_PAGE,
<mask> } from '../../helpers/constants';
<mask> import Loading from '../ui/Loading';
<mask> import Filters from './Filters';
<mask> import Table from './Table';
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove BLOCK_ACTIONS, smallScreenSize,
</s> add BLOCK_ACTIONS, </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers'; </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import { TABLE_DEFAULT_PAGE_SIZE, TABLE_FIRST_PAGE } from '../helpers/constants';
</s> add import {
DEFAULT_LOGS_FILTER,
TABLE_DEFAULT_PAGE_SIZE,
TABLE_FIRST_PAGE,
} from '../helpers/constants'; </s> remove import { getLogsConfig } from '../../actions/queryLogs';
</s> add import {
getLogsConfig,
refreshFilteredLogs,
resetFilteredLogs,
setFilteredLogs,
} from '../../actions/queryLogs'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
import {
getLogsConfig,
refreshFilteredLogs,
resetFilteredLogs,
setFilteredLogs,
} from '../../actions/queryLogs'; | <mask> import Disabled from './Disabled';
<mask> import { getFilteringStatus } from '../../actions/filtering';
<mask> import { getClients } from '../../actions';
<mask> import { getDnsConfig } from '../../actions/dnsConfig';
<mask> import { getLogsConfig } from '../../actions/queryLogs';
<mask> import { addSuccessToast } from '../../actions/toasts';
<mask> import './Logs.css';
<mask>
<mask> const INITIAL_REQUEST = true;
<mask> const INITIAL_REQUEST_DATA = ['', TABLE_FIRST_PAGE, INITIAL_REQUEST];
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const INITIAL_REQUEST = true;
const INITIAL_REQUEST_DATA = ['', TABLE_FIRST_PAGE, INITIAL_REQUEST];
</s> add </s> remove import { TABLE_DEFAULT_PAGE_SIZE, TABLE_FIRST_PAGE } from '../helpers/constants';
</s> add import {
DEFAULT_LOGS_FILTER,
TABLE_DEFAULT_PAGE_SIZE,
TABLE_FIRST_PAGE,
} from '../helpers/constants'; </s> remove getLogs, setLogsPagination, setLogsFilter, setLogsPage, toggleDetailedLogs,
</s> add getLogs, setLogsPagination, setLogsPage, toggleDetailedLogs, </s> remove import { useDispatch } from 'react-redux';
</s> add import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import queryString from 'query-string'; </s> remove import { useDispatch } from 'react-redux';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
<mask> import { getLogsConfig } from '../../actions/queryLogs';
<mask> import { addSuccessToast } from '../../actions/toasts';
<mask> import './Logs.css';
<mask>
<mask> const INITIAL_REQUEST = true;
<mask> const INITIAL_REQUEST_DATA = ['', TABLE_FIRST_PAGE, INITIAL_REQUEST];
<mask>
<mask> export const processContent = (data, buttonType) => Object.entries(data)
<mask> .map(([key, value]) => {
<mask> if (!value) {
<mask> return null;
<mask> }
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { getLogsConfig } from '../../actions/queryLogs';
</s> add import {
getLogsConfig,
refreshFilteredLogs,
resetFilteredLogs,
setFilteredLogs,
} from '../../actions/queryLogs'; </s> remove import { TABLE_DEFAULT_PAGE_SIZE, TABLE_FIRST_PAGE } from '../helpers/constants';
</s> add import {
DEFAULT_LOGS_FILTER,
TABLE_DEFAULT_PAGE_SIZE,
TABLE_FIRST_PAGE,
} from '../helpers/constants'; </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add </s> remove getLogs, setLogsPagination, setLogsFilter, setLogsPage, toggleDetailedLogs,
</s> add getLogs, setLogsPagination, setLogsPage, toggleDetailedLogs, </s> remove import { useDispatch } from 'react-redux';
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js | |
const history = useHistory();
const {
response_status: response_status_url_param = '',
search: search_url_param = '',
} = queryString.parse(history.location.search);
const { filter } = useSelector((state) => state.queryLogs, shallowEqual);
const search = filter?.search || search_url_param;
const response_status = filter?.response_status || response_status_url_param;
| <mask> const Logs = (props) => {
<mask> const dispatch = useDispatch();
<mask> const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth < smallScreenSize);
<mask> const [detailedDataCurrent, setDetailedDataCurrent] = useState({});
<mask> const [buttonType, setButtonType] = useState(BLOCK_ACTIONS.BLOCK);
<mask> const [isModalOpened, setModalOpened] = useState(false);
<mask> const [isLoading, setIsLoading] = useState(false);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove submit,
reset,
</s> add </s> remove const debouncedSubmit = debounce(submit, DEBOUNCE_FILTER_TIMEOUT);
const zeroDelaySubmit = () => setTimeout(submit, 0);
</s> add const {
response_status, search,
} = useSelector((state) => state.form[FORM_NAME.LOGS_FILTER].values, shallowEqual); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
useEffect(() => {
(async () => {
setIsLoading(true);
await dispatch(setFilteredLogs({
search,
response_status,
}));
setIsLoading(false);
})();
}, [response_status, search]);
| <mask> const [isLoading, setIsLoading] = useState(false);
<mask>
<mask> const {
<mask> filtering,
<mask> setLogsPage,
<mask> setLogsPagination,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove setLogsFilter,
</s> add </s> remove getLogs, setLogsPagination, setLogsFilter, setLogsPage, toggleDetailedLogs,
</s> add getLogs, setLogsPagination, setLogsPage, toggleDetailedLogs, </s> remove setLogsFilter,
</s> add </s> remove submit,
reset,
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
<mask> const {
<mask> filtering,
<mask> setLogsPage,
<mask> setLogsPagination,
<mask> setLogsFilter,
<mask> toggleDetailedLogs,
<mask> dashboard,
<mask> dnsConfig,
<mask> queryLogs: {
<mask> filter,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove filter,
</s> add </s> remove getLogs, setLogsPagination, setLogsFilter, setLogsPage, toggleDetailedLogs,
</s> add getLogs, setLogsPagination, setLogsPage, toggleDetailedLogs, </s> remove setLogsFilter,
</s> add </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js | |
<mask> toggleDetailedLogs,
<mask> dashboard,
<mask> dnsConfig,
<mask> queryLogs: {
<mask> filter,
<mask> enabled,
<mask> processingGetConfig,
<mask> processingAdditionalLogs,
<mask> processingGetLogs,
<mask> oldest,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove setLogsFilter,
</s> add </s> remove logs, oldest, older_than, filter, ...values,
</s> add logs,
oldest,
older_than,
filter,
...values, </s> remove const additionalLogs = await getLogsWithParams({ older_than: oldest, filter });
</s> add const additionalLogs = await getLogsWithParams({
older_than: oldest,
filter,
}); </s> remove getLogs, setLogsPagination, setLogsFilter, setLogsPage, toggleDetailedLogs,
</s> add getLogs, setLogsPagination, setLogsPage, toggleDetailedLogs, </s> remove [actions.setLogsFilterSuccess]: (state, { payload }) => {
</s> add [actions.setFilteredLogsSuccess]: (state, { payload }) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js | |
<mask> toggleDetailedLogs(false);
<mask> }
<mask> };
<mask>
<mask> useEffect(() => {
<mask> mediaQuery.addListener(mediaQueryHandler);
<mask>
<mask> return () => mediaQuery.removeListener(mediaQueryHandler);
<mask> }, []);
<mask>
<mask> const closeModal = () => setModalOpened(false);
<mask>
<mask> const getLogs = (older_than, page, initial) => {
<mask> if (props.queryLogs.enabled) {
<mask> props.getLogs({
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove if (props.queryLogs.enabled) {
</s> add if (enabled) { </s> remove const clearInput = async () => {
await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
await reset();
};
</s> add const [
debouncedSearch,
setDebouncedSearch,
] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
useEffect(() => {
dispatch(setLogsFilter({
response_status,
search: debouncedSearch,
}));
history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
}, [response_status, debouncedSearch]);
if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
} </s> remove await clearInput();
</s> add setDebouncedSearch(DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]); </s> remove useEffect(() => clearInput, []);
</s> add const onEnterPress = (e) => {
if (e.key === 'Enter') {
setDebouncedSearch(search);
}
};
const normalizeOnBlur = (data) => data.trim(); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js | |
if (enabled) { | <mask>
<mask> const closeModal = () => setModalOpened(false);
<mask>
<mask> const getLogs = (older_than, page, initial) => {
<mask> if (props.queryLogs.enabled) {
<mask> props.getLogs({
<mask> older_than,
<mask> page,
<mask> pageSize: TABLE_DEFAULT_PAGE_SIZE,
<mask> initial,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove useEffect(() => {
mediaQuery.addListener(mediaQueryHandler);
return () => mediaQuery.removeListener(mediaQueryHandler);
}, []);
</s> add </s> remove dispatch(setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }));
</s> add dispatch(setLogsPagination({
page,
pageSize: TABLE_DEFAULT_PAGE_SIZE,
})); </s> remove const [t] = useTranslation();
</s> add const { t } = useTranslation(); </s> remove const rawLogs = await apiClient.getQueryLog({ ...filter, older_than });
</s> add const rawLogs = await apiClient.getQueryLog({
...filter,
older_than,
}); </s> remove const data = await getLogsWithParams({ ...config, filter });
</s> add const data = await getLogsWithParams({
...config,
filter,
}); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
mediaQuery.addEventListener('change', mediaQueryHandler);
| <mask> }
<mask> };
<mask>
<mask> useEffect(() => {
<mask> (async () => {
<mask> setIsLoading(true);
<mask> dispatch(setLogsPage(TABLE_FIRST_PAGE));
<mask> dispatch(getFilteringStatus());
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove await clearInput();
</s> add setDebouncedSearch(DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]); </s> remove useEffect(() => {
mediaQuery.addListener(mediaQueryHandler);
return () => mediaQuery.removeListener(mediaQueryHandler);
}, []);
</s> add </s> remove const clearInput = async () => {
await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
await reset();
};
</s> add const [
debouncedSearch,
setDebouncedSearch,
] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
useEffect(() => {
dispatch(setLogsFilter({
response_status,
search: debouncedSearch,
}));
history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
}, [response_status, debouncedSearch]);
if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
<mask> dispatch(getFilteringStatus());
<mask> dispatch(getClients());
<mask> try {
<mask> await Promise.all([
<mask> getLogs(...INITIAL_REQUEST_DATA),
<mask> dispatch(getLogsConfig()),
<mask> dispatch(getDnsConfig()),
<mask> ]);
<mask> } catch (err) {
<mask> console.error(err);
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove getLogs(...INITIAL_REQUEST_DATA),
</s> add dispatch(refreshFilteredLogs()), </s> remove dispatch(setLogsPagination({ page, pageSize: TABLE_DEFAULT_PAGE_SIZE }));
</s> add dispatch(setLogsPagination({
page,
pageSize: TABLE_DEFAULT_PAGE_SIZE,
})); </s> remove dispatch(setLogsFilterSuccess({ ...updatedData, filter }));
</s> add dispatch(setFilteredLogsSuccess({
...updatedData,
filter,
})); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js | |
return () => {
mediaQuery.removeEventListener('change', mediaQueryHandler);
dispatch(resetFilteredLogs());
}; | <mask> setIsLoading(false);
<mask> }
<mask> })();
<mask> }, []);
<mask>
<mask> const refreshLogs = async () => {
<mask> setIsLoading(true);
<mask> await Promise.all([
<mask> dispatch(setLogsPage(TABLE_FIRST_PAGE)),
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove getLogs(...INITIAL_REQUEST_DATA),
</s> add dispatch(refreshFilteredLogs()), </s> remove await clearInput();
</s> add setDebouncedSearch(DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]); </s> remove const clearInput = async () => {
await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
await reset();
};
</s> add const [
debouncedSearch,
setDebouncedSearch,
] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
useEffect(() => {
dispatch(setLogsFilter({
response_status,
search: debouncedSearch,
}));
history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
}, [response_status, debouncedSearch]);
if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
} </s> remove useEffect(() => {
mediaQuery.addListener(mediaQueryHandler);
return () => mediaQuery.removeListener(mediaQueryHandler);
}, []);
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
dispatch(refreshFilteredLogs()), | <mask> const refreshLogs = async () => {
<mask> setIsLoading(true);
<mask> await Promise.all([
<mask> dispatch(setLogsPage(TABLE_FIRST_PAGE)),
<mask> getLogs(...INITIAL_REQUEST_DATA),
<mask> ]);
<mask> dispatch(addSuccessToast('query_log_updated'));
<mask> setIsLoading(false);
<mask> };
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove await clearInput();
</s> add setDebouncedSearch(DEFAULT_LOGS_FILTER[FORM_NAMES.search]);
change(FORM_NAMES.search, DEFAULT_LOGS_FILTER[FORM_NAMES.search]); </s> remove getLogs(...INITIAL_REQUEST_DATA),
</s> add </s> remove const clearInput = async () => {
await dispatch(setLogsFilter(DEFAULT_LOGS_FILTER));
await reset();
};
</s> add const [
debouncedSearch,
setDebouncedSearch,
] = useDebounce(search.trim(), DEBOUNCE_FILTER_TIMEOUT);
useEffect(() => {
dispatch(setLogsFilter({
response_status,
search: debouncedSearch,
}));
history.replace(`${getLogsUrlParams(debouncedSearch, response_status)}`);
}, [response_status, debouncedSearch]);
if (response_status && !(response_status in RESPONSE_FILTER_QUERIES)) {
change(FORM_NAMES.response_status, DEFAULT_LOGS_FILTER[FORM_NAMES.response_status]);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
<> | <mask> return (
<mask> <>
<mask> {enabled && processingGetConfig && <Loading />}
<mask> {enabled && !processingGetConfig && (
<mask> <Fragment>
<mask> <Filters
<mask> filter={filter}
<mask> setIsLoading={setIsLoading}
<mask> processingGetLogs={processingGetLogs}
<mask> processingAdditionalLogs={processingAdditionalLogs}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove filter={filter}
</s> add filter={{
response_status,
search,
}} </s> remove </Fragment>
</s> add </> </s> remove {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; </s> remove <Route path={MENU_URLS.logs} component={Logs} />
</s> add <Route
path={[`${MENU_URLS.logs}${getLogsUrlParams(':search?', ':response_status?')}`, MENU_URLS.logs]}
component={Logs} /> </s> remove setLogsFilter={setLogsFilter}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
filter={{
response_status,
search,
}} | <mask> {enabled && processingGetConfig && <Loading />}
<mask> {enabled && !processingGetConfig && (
<mask> <Fragment>
<mask> <Filters
<mask> filter={filter}
<mask> setIsLoading={setIsLoading}
<mask> processingGetLogs={processingGetLogs}
<mask> processingAdditionalLogs={processingAdditionalLogs}
<mask> setLogsFilter={setLogsFilter}
<mask> refreshLogs={refreshLogs}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove <Fragment>
</s> add <> </s> remove setLogsFilter={setLogsFilter}
</s> add </s> remove </Fragment>
</s> add </> </s> remove {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; </s> remove <Route path={MENU_URLS.logs} component={Logs} />
</s> add <Route
path={[`${MENU_URLS.logs}${getLogsUrlParams(':search?', ':response_status?')}`, MENU_URLS.logs]}
component={Logs} /> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
<mask> filter={filter}
<mask> setIsLoading={setIsLoading}
<mask> processingGetLogs={processingGetLogs}
<mask> processingAdditionalLogs={processingAdditionalLogs}
<mask> setLogsFilter={setLogsFilter}
<mask> refreshLogs={refreshLogs}
<mask> />
<mask> <Table
<mask> isLoading={isLoading}
<mask> setIsLoading={setIsLoading}
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove filter={filter}
</s> add filter={{
response_status,
search,
}} </s> remove <Fragment>
</s> add <> </s> remove />
</s> add /> </s> remove onSubmit={onSubmit}
</s> add </s> remove );
};
</s> add ); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js | |
</> | <mask> <use xlinkHref="#cross" />
<mask> </svg>
<mask> {processContent(detailedDataCurrent, buttonType)}
<mask> </Modal>
<mask> </Fragment>
<mask> )}
<mask> {!enabled && !processingGetConfig && (
<mask> <Disabled />
<mask> )}
<mask> </>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove <Route path={MENU_URLS.logs} component={Logs} />
</s> add <Route
path={[`${MENU_URLS.logs}${getLogsUrlParams(':search?', ':response_status?')}`, MENU_URLS.logs]}
component={Logs} /> </s> remove }) => <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder} />
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<Tooltip text={tooltip} type='tooltip-custom--logs' />
</s> add onKeyDown,
normalizeOnBlur,
}) => {
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
return <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder}
onKeyDown={onKeyDown}
onBlur={onBlur}
/>
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<IconTooltip text={tooltip} type='tooltip-custom--logs' /> </s> remove <Fragment>
</s> add <> </s> remove filter={filter}
</s> add filter={{
response_status,
search,
}} </s> remove {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js |
<mask> filtering: PropTypes.object.isRequired,
<mask> setRules: PropTypes.func.isRequired,
<mask> addSuccessToast: PropTypes.func.isRequired,
<mask> setLogsPagination: PropTypes.func.isRequired,
<mask> setLogsFilter: PropTypes.func.isRequired,
<mask> setLogsPage: PropTypes.func.isRequired,
<mask> toggleDetailedLogs: PropTypes.func.isRequired,
<mask> dnsConfig: PropTypes.object.isRequired,
<mask> };
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove submit: PropTypes.func.isRequired,
reset: PropTypes.func.isRequired,
</s> add change: PropTypes.func.isRequired, </s> remove handleChange: PropTypes.func,
</s> add </s> remove );
};
</s> add ); </s> remove export default withTranslation()(Counters);
</s> add export default Counters; </s> remove {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</>;
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Logs/index.js | |
import LogsSearchLink from '../../ui/LogsSearchLink'; | <mask>
<mask> import whoisCell from './whoisCell';
<mask>
<mask> const COLUMN_MIN_WIDTH = 200;
<mask>
<mask> class AutoClients extends Component {
<mask> columns = [
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers'; </s> remove { route: FILTERS_URLS.dns_blocklists, text: 'dns_blocklists' },
{ route: FILTERS_URLS.dns_allowlists, text: 'dns_allowlists' },
{ route: FILTERS_URLS.dns_rewrites, text: 'dns_rewrites' },
{ route: FILTERS_URLS.blocked_services, text: 'blocked_services' },
{ route: FILTERS_URLS.custom_rules, text: 'custom_filtering_rules' },
</s> add {
route: FILTERS_URLS.dns_blocklists,
text: 'dns_blocklists',
},
{
route: FILTERS_URLS.dns_allowlists,
text: 'dns_allowlists',
},
{
route: FILTERS_URLS.dns_rewrites,
text: 'dns_rewrites',
},
{
route: FILTERS_URLS.blocked_services,
text: 'blocked_services',
},
{
route: FILTERS_URLS.custom_rules,
text: 'custom_filtering_rules',
}, </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Settings/Clients/AutoClients.js |
<LogsSearchLink search={row.original.ip}>
{clientStats}
</LogsSearchLink> | <mask> if (clientStats) {
<mask> return (
<mask> <div className="logs__row">
<mask> <div className="logs__text" title={clientStats}>
<mask> {clientStats}
<mask> </div>
<mask> </div>
<mask> );
<mask> }
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> </s> remove interval={stats.interval}
dnsQueries={stats.numDnsQueries}
blockedFiltering={stats.numBlockedFiltering}
replacedSafebrowsing={stats.numReplacedSafebrowsing}
replacedParental={stats.numReplacedParental}
replacedSafesearch={stats.numReplacedSafesearch}
avgProcessingTime={stats.avgProcessingTime}
</s> add </s> remove </Fragment>
</s> add </> </s> remove }) => <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder} />
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<Tooltip text={tooltip} type='tooltip-custom--logs' />
</s> add onKeyDown,
normalizeOnBlur,
}) => {
const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur);
return <>
<div className="input-group-search input-group-search__icon--magnifier">
<svg className="icons icon--small icon--gray">
<use xlinkHref="#magnifier" />
</svg>
</div>
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
aria-label={placeholder}
onKeyDown={onKeyDown}
onBlur={onBlur}
/>
<div
className={classNames('input-group-search input-group-search__icon--cross', { invisible: input.value.length < 1 })}>
<svg className="icons icon--smallest icon--gray" onClick={onClearInputClick}>
<use xlinkHref="#cross" />
</svg>
</div>
<span className="input-group-search input-group-search__icon--tooltip">
<IconTooltip text={tooltip} type='tooltip-custom--logs' /> </s> remove );
</s> add </div>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Settings/Clients/AutoClients.js |
import LogsSearchLink from '../../ui/LogsSearchLink'; | <mask> import { normalizeTextarea } from '../../../helpers/helpers';
<mask> import Card from '../../ui/Card';
<mask> import Modal from './Modal';
<mask> import CellWrap from '../../ui/CellWrap';
<mask>
<mask> class ClientsTable extends Component {
<mask> handleFormAdd = (values) => {
<mask> this.props.addClient(values);
<mask> };
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers'; </s> remove import Tooltip from '../ui/Tooltip';
</s> add import IconTooltip from '../ui/IconTooltip'; </s> remove BLOCK_ACTIONS, smallScreenSize,
</s> add BLOCK_ACTIONS, </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Settings/Clients/ClientsTable.js |
options.map((option) => ({
value: option,
label: option,
})) | <mask> }
<mask> };
<mask>
<mask> getOptionsWithLabels = (options) => (
<mask> options.map((option) => ({ value: option, label: option }))
<mask> );
<mask>
<mask> getClient = (name, clients) => {
<mask> const client = clients.find((item) => name === item.name);
<mask>
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const isActivePage = Object.values(URLS).some((item) => item === pathname);
</s> add const isActivePage = Object.values(URLS)
.some((item) => item === pathname); </s> remove useEffect(() => clearInput, []);
</s> add const onEnterPress = (e) => {
if (e.key === 'Enter') {
setDebouncedSearch(search);
}
};
const normalizeOnBlur = (data) => data.trim(); </s> remove const Filters = ({ filter, refreshLogs, setIsLoading }) => {
const dispatch = useDispatch();
const onSubmit = async (values) => {
setIsLoading(true);
await dispatch(setLogsFilter(values));
setIsLoading(false);
};
return (
</s> add const Filters = ({ filter, refreshLogs, setIsLoading }) => ( </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; </s> remove return <Cell value={value} percent={percent} color={percentColor} />;
</s> add return <Cell value={value} percent={percent} color={percentColor}
search={row.original.domain} />; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Settings/Clients/ClientsTable.js |
Cell: (row) => {
const content = CellWrap(row);
if (!row.value) {
return content;
}
return <LogsSearchLink search={row.original.ids[0]}>{content}</LogsSearchLink>;
}, | <mask> id: 'statistics',
<mask> accessor: (row) => this.props.normalizedTopClients.configured[row.name] || 0,
<mask> sortMethod: (a, b) => b - a,
<mask> minWidth: 120,
<mask> Cell: CellWrap,
<mask> },
<mask> {
<mask> Header: this.props.t('actions_table_header'),
<mask> accessor: 'actions',
<mask> maxWidth: 100,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove route: MENU_URLS.root, exact: true, icon: 'dashboard', text: 'dashboard', order: 0,
</s> add route: MENU_URLS.root,
exact: true,
icon: 'dashboard',
text: 'dashboard',
order: 0, </s> remove loading={isLoading}
</s> add loading={isLoading || processingGetLogs} </s> remove const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const rows = [
{
label: 'dns_query',
count: numDnsQueries,
tooltipTitle: interval === 1 ? 'number_of_dns_query_24_hours' : t('number_of_dns_query_days', { count: interval }),
response_status: RESPONSE_FILTER.ALL.query,
},
{
label: 'blocked_by',
count: numBlockedFiltering,
tooltipTitle: 'number_of_dns_query_blocked_24_hours',
response_status: RESPONSE_FILTER.BLOCKED.query,
translationComponents: [<a href="#filters" key="0">link</a>],
},
{
label: 'stats_malware_phishing',
count: numReplacedSafebrowsing,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_by_sec',
response_status: RESPONSE_FILTER.BLOCKED_THREATS.query,
},
{
label: 'stats_adult',
count: numReplacedParental,
tooltipTitle: 'number_of_dns_query_blocked_24_hours_adult',
response_status: RESPONSE_FILTER.BLOCKED_ADULT_WEBSITES.query,
},
{
label: 'enforced_save_search',
count: numReplacedSafesearch,
tooltipTitle: 'number_of_dns_query_to_safe_search',
response_status: RESPONSE_FILTER.SAFE_SEARCH.query,
},
{
label: 'average_processing_time',
count: avgProcessingTime ? `${round(avgProcessingTime)} ms` : 0,
tooltipTitle: 'average_processing_time_hint',
},
]; </s> remove const className = classNames('text-truncate key-colon o-hidden', {
</s> add const className = classNames('text-truncate o-hidden', { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/Settings/Clients/ClientsTable.js |
import LogsSearchLink from './LogsSearchLink'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import { formatNumber } from '../../helpers/helpers';
<mask>
<mask> const Cell = ({ value, percent, color }) => (
<mask> <div className="stats__row">
<mask> <div className="stats__row-value mb-1">
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove const Cell = ({ value, percent, color }) => (
<div className="stats__row">
<div className="stats__row-value mb-1">
<strong>{formatNumber(value)}</strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/>
</div>
</s> add const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> </s> remove
</s> add import { shallowEqual, useSelector } from 'react-redux'; </s> remove import PropTypes from 'prop-types';
import { Trans, withTranslation } from 'react-i18next';
</s> add import propTypes from 'prop-types';
import { Trans, useTranslation } from 'react-i18next'; </s> remove import { useDispatch } from 'react-redux';
</s> add </s> remove import { setLogsFilter } from '../../../actions/queryLogs';
</s> add | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/ui/Cell.js |
const Cell = ({
value, percent, color, search,
}) => <div className="stats__row">
<div className="stats__row-value mb-1">
<strong><LogsSearchLink search={search}>{formatNumber(value)}</LogsSearchLink></strong>
<small className="ml-3 text-muted">{percent}%</small>
</div>
<div className="progress progress-xs">
<div
className="progress-bar"
style={{
width: `${percent}%`,
backgroundColor: color,
}}
/> | <mask> import PropTypes from 'prop-types';
<mask>
<mask> import { formatNumber } from '../../helpers/helpers';
<mask>
<mask> const Cell = ({ value, percent, color }) => (
<mask> <div className="stats__row">
<mask> <div className="stats__row-value mb-1">
<mask> <strong>{formatNumber(value)}</strong>
<mask> <small className="ml-3 text-muted">{percent}%</small>
<mask> </div>
<mask> <div className="progress progress-xs">
<mask> <div
<mask> className="progress-bar"
<mask> style={{
<mask> width: `${percent}%`,
<mask> backgroundColor: color,
<mask> }}
<mask> />
<mask> </div>
<mask> </div>
<mask> );
<mask>
<mask> Cell.propTypes = {
<mask> value: PropTypes.number.isRequired,
</s> +client: "Drill down" to activity reports
Close #1625
Squashed commit of the following:
commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:50:15 2020 +0300
minor
commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:44 2020 +0300
Merge branch 'feature/1625' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1625
commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jul 13 15:32:41 2020 +0300
fix makefile when there's no gopath
commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 15:30:21 2020 +0300
Merge branch 'master' into feature/1625
commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:35:16 2020 +0300
Merge branch 'master' into feature/1625
commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 12:34:42 2020 +0300
Simplify sync logs action creators
commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Mon Jul 13 11:17:08 2020 +0300
Review changes
commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 15:23:37 2020 +0300
Update tracker tooltip class
commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:46:10 2020 +0300
Replace depricated addListener
commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 13:39:45 2020 +0300
Validate response_status url param
commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Fri Jul 10 12:58:18 2020 +0300
Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action
commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 19:41:48 2020 +0300
Normalize input search
commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 18:20:05 2020 +0300
Optimize search
commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 14:28:41 2020 +0300
Update url string params
commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jul 9 12:55:50 2020 +0300
Fix reset search
commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 19:13:21 2020 +0300
WIP: Add permlinks
commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Jul 8 14:42:28 2020 +0300
Refactor Counters, add response_status links to query log
commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:33:04 2020 +0300
Delete unnecessary file
commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 19:30:44 2020 +0300
Resolve conflict
commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Jul 7 17:14:51 2020 +0300
+ client: Add git hooks
... and 5 more commits </s> remove
</s> add import LogsSearchLink from './LogsSearchLink'; </s> remove );
</s> add </div>; </s> remove {clientStats}
</s> add <LogsSearchLink search={row.original.ip}>
{clientStats}
</LogsSearchLink> </s> remove const Filters = ({ filter, refreshLogs, setIsLoading }) => {
const dispatch = useDispatch();
const onSubmit = async (values) => {
setIsLoading(true);
await dispatch(setLogsFilter(values));
setIsLoading(false);
};
return (
</s> add const Filters = ({ filter, refreshLogs, setIsLoading }) => ( </s> remove interval={stats.interval}
dnsQueries={stats.numDnsQueries}
blockedFiltering={stats.numBlockedFiltering}
replacedSafebrowsing={stats.numReplacedSafebrowsing}
replacedParental={stats.numReplacedParental}
replacedSafesearch={stats.numReplacedSafesearch}
avgProcessingTime={stats.avgProcessingTime}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/da4a1ec23d30a7c1ff3d70f943bb9d29ac7feeea | client/src/components/ui/Cell.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.