Pull request 1782: 5630-fix-interval
Merge in DNS/adguard-home from 5630-fix-interval to master
Updates #5630.
Squashed commit of the following:
commit eb3839bb63cde40c477843cad1262c8eaa95406a
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 16:25:23 2023 +0300
fix lint
commit 1899810ba8e3d2496f35bb052aeda60da565ffa3
Merge: 52526687 2409282d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 16:01:50 2023 +0300
Merge branch 'master' into 5630-fix-interval
commit 52526687e651254a81da091106d88b50b656af2f
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Mar 24 15:26:01 2023 +0300
convert milliseconds to days for stats interval
commit e719814e84bf0ddaec8f4d47a94cc2b5075a7dc5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 24 14:05:55 2023 +0300
openapi: fix description
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import { handleActions } from 'redux-actions';
|
||||
|
||||
import * as actions from '../actions/queryLogs';
|
||||
import { DEFAULT_LOGS_FILTER } from '../helpers/constants';
|
||||
import { DEFAULT_LOGS_FILTER, DAY } from '../helpers/constants';
|
||||
|
||||
const queryLogs = handleActions(
|
||||
{
|
||||
@@ -86,7 +86,7 @@ const queryLogs = handleActions(
|
||||
processingGetConfig: false,
|
||||
processingSetConfig: false,
|
||||
processingAdditionalLogs: false,
|
||||
interval: 1,
|
||||
interval: DAY,
|
||||
logs: [],
|
||||
enabled: true,
|
||||
oldest: '',
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { handleActions } from 'redux-actions';
|
||||
import { normalizeTopClients } from '../helpers/helpers';
|
||||
import { DAY } from '../helpers/constants';
|
||||
|
||||
import * as actions from '../actions/stats';
|
||||
|
||||
@@ -91,7 +92,7 @@ const stats = handleActions(
|
||||
processingSetConfig: false,
|
||||
processingStats: true,
|
||||
processingReset: false,
|
||||
interval: 1,
|
||||
interval: DAY,
|
||||
...defaultStats,
|
||||
},
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user