daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request #2231: ADG-8368 Frontend rewritten in TypeScript, added Node 18 support

Browse Source 
Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master

Squashed commit of the following:

commit daa288ae0d76178af24595cc807055902e6f09ab
Merge: 4c89cf720 1085d59a6
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Mon Jun 10 17:22:20 2024 +0200

    merge

commit 4c89cf7209
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Jun 6 13:27:18 2024 +0300

    remove install from initial state

commit b943f2011f
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 23:10:55 2024 +0200

    frontend production build fix

commit cd1be2d66d
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 20:23:14 2024 +0200

    production build quickfix

commit 7b8ac01fc2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jun 5 19:57:31 2024 +0300

    all: upd node docker

commit 02afed66d5
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 18:23:12 2024 +0200

    changelog fixes

commit 9c0f736f0c
Merge: 62c4fbf1e e04775c4f
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 18:18:29 2024 +0200

    merge

commit 62c4fbf1e3
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 16:22:22 2024 +0200

    empty line in changelog

commit 76b1e44a93
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 16:20:37 2024 +0200

    changelog

commit f783e90040
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 16:19:13 2024 +0200

    filters.js -> filters.ts

commit 3d4ce6554c
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 16:18:03 2024 +0200

    generated file removed

commit e35ba58f2a
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 15:45:21 2024 +0200

    rollback unwanted changes

commit 1f30d4216d
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 15:27:36 2024 +0200

    review fix

commit 6cd4e44f07
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 11:55:39 2024 +0200

    missing generated file restoresd

commit 2ab738b303
Author: Igor Lobanov <bniwredyc@gmail.com>
Date:   Wed Jun 5 11:40:32 2024 +0200

    Frontend rewritten in TypeScript, added Node 18 support
This commit is contained in:
Igor Lobanov
2024-06-10 18:42:23 +03:00
parent 1085d59a65
commit 1afe226ce8
296 changed files with 32122 additions and 32651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
client/src/reducers/queryLogs.ts Normal file
View File

@@ -0,0 +1,143 @@
import { handleActions } from 'redux-actions';
import * as actions from '../actions/queryLogs';
import { DEFAULT_LOGS_FILTER, DAY, QUERY_LOG_INTERVALS_DAYS, HOUR } from '../helpers/constants';
const queryLogs = handleActions(
{
[actions.setFilteredLogsRequest.toString()]: (state: any) => ({
...state,
processingGetLogs: true,
}),
[actions.setFilteredLogsFailure.toString()]: (state: any) => ({
...state,
processingGetLogs: false,
}),
[actions.toggleDetailedLogs.toString()]: (state, { payload }: any) => ({
...state,
isDetailed: payload,
}),
[actions.setFilteredLogsSuccess.toString()]: (state: any, { payload }: any) => {
const { logs, oldest, filter } = payload;
const isFiltered = filter && Object.keys(filter).some((key) => filter[key]);
return {
...state,
oldest,
filter,
isFiltered,
logs,
isEntireLog: logs.length < 1,
processingGetLogs: false,
};
},
[actions.setLogsFilterRequest.toString()]: (state, { payload }: any) => ({
...state,
filter: payload,
}),
[actions.getLogsRequest.toString()]: (state: any) => ({
...state,
processingGetLogs: true,
}),
[actions.getLogsFailure.toString()]: (state: any) => ({
...state,
processingGetLogs: false,
}),
[actions.getLogsSuccess.toString()]: (state: any, { payload }: any) => {
const { logs, oldest, older_than } = payload;
return {
...state,
oldest,
logs: older_than ? [...state.logs, ...logs] : logs,
isEntireLog: logs.length < 1,
processingGetLogs: false,
};
},
[actions.clearLogsRequest.toString()]: (state: any) => ({
...state,
processingClear: true,
}),
[actions.clearLogsFailure.toString()]: (state: any) => ({
...state,
processingClear: false,
}),
[actions.clearLogsSuccess.toString()]: (state: any) => ({
...state,
logs: [],
processingClear: false,
}),
[actions.getLogsConfigRequest.toString()]: (state: any) => ({
...state,
processingGetConfig: true,
}),
[actions.getLogsConfigFailure.toString()]: (state: any) => ({
...state,
processingGetConfig: false,
}),
[actions.getLogsConfigSuccess.toString()]: (state, { payload }: any) => ({
...state,
...payload,
customInterval: !QUERY_LOG_INTERVALS_DAYS.includes(payload.interval) ? payload.interval / HOUR : null,
processingGetConfig: false,
}),
[actions.setLogsConfigRequest.toString()]: (state: any) => ({
...state,
processingSetConfig: true,
}),
[actions.setLogsConfigFailure.toString()]: (state: any) => ({
...state,
processingSetConfig: false,
}),
[actions.setLogsConfigSuccess.toString()]: (state, { payload }: any) => ({
...state,
...payload,
processingSetConfig: false,
}),
[actions.getAdditionalLogsRequest.toString()]: (state: any) => ({
...state,
processingAdditionalLogs: true,
processingGetLogs: true,
}),
[actions.getAdditionalLogsFailure.toString()]: (state: any) => ({
...state,
processingAdditionalLogs: false,
processingGetLogs: false,
}),
[actions.getAdditionalLogsSuccess.toString()]: (state: any) => ({
...state,
processingAdditionalLogs: false,
processingGetLogs: false,
isEntireLog: true,
}),
},
{
processingGetLogs: true,
processingClear: false,
processingGetConfig: false,
processingSetConfig: false,
processingAdditionalLogs: false,
interval: DAY,
logs: [],
enabled: true,
oldest: '',
filter: DEFAULT_LOGS_FILTER,
isFiltered: false,
anonymize_client_ip: false,
isDetailed: true,
isEntireLog: false,
customInterval: null,
},
);
export default queryLogs;