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

230
client/src/reducers/dhcp.ts Normal file
View File

@@ -0,0 +1,230 @@
import { handleActions } from 'redux-actions';
import * as actions from '../actions';
import { enrichWithConcatenatedIpAddresses } from '../helpers/helpers';
const dhcp = handleActions(
{
[actions.getDhcpStatusRequest.toString()]: (state: any) => ({
...state,
processing: true,
}),
[actions.getDhcpStatusFailure.toString()]: (state: any) => ({
...state,
processing: false,
}),
[actions.getDhcpStatusSuccess.toString()]: (state: any, { payload }: any) => {
const { static_leases: staticLeases, ...values } = payload;
const newState = {
...state,
staticLeases,
processing: false,
...values,
};
return newState;
},
[actions.getDhcpInterfacesRequest.toString()]: (state: any) => ({
...state,
processingInterfaces: true,
}),
[actions.getDhcpInterfacesFailure.toString()]: (state: any) => ({
...state,
processingInterfaces: false,
}),
[actions.getDhcpInterfacesSuccess.toString()]: (state: any, { payload }: any) => {
const newState = {
...state,
interfaces: enrichWithConcatenatedIpAddresses(payload),
processingInterfaces: false,
};
return newState;
},
[actions.findActiveDhcpRequest.toString()]: (state: any) => ({
...state,
processingStatus: true,
}),
[actions.findActiveDhcpFailure.toString()]: (state: any) => ({
...state,
processingStatus: false,
}),
[actions.findActiveDhcpSuccess.toString()]: (state: any, { payload }: any) => {
const newState = {
...state,
check: payload,
processingStatus: false,
};
return newState;
},
[actions.toggleDhcpRequest.toString()]: (state: any) => ({
...state,
processingDhcp: true,
}),
[actions.toggleDhcpFailure.toString()]: (state: any) => ({
...state,
processingDhcp: false,
}),
[actions.toggleDhcpSuccess.toString()]: (state: any) => {
const { enabled } = state;
const newState = {
...state,
enabled: !enabled,
check: null,
processingDhcp: false,
};
return newState;
},
[actions.setDhcpConfigRequest.toString()]: (state: any) => ({
...state,
processingConfig: true,
}),
[actions.setDhcpConfigFailure.toString()]: (state: any) => ({
...state,
processingConfig: false,
}),
[actions.setDhcpConfigSuccess.toString()]: (state: any, { payload }: any) => {
const { v4, v6 } = state;
const newConfigV4 = { ...v4, ...payload.v4 };
const newConfigV6 = { ...v6, ...payload.v6 };
const newState = {
...state,
v4: newConfigV4,
v6: newConfigV6,
interface_name: payload.interface_name,
processingConfig: false,
};
return newState;
},
[actions.resetDhcpRequest.toString()]: (state: any) => ({
...state,
processingReset: true,
}),
[actions.resetDhcpFailure.toString()]: (state: any) => ({
...state,
processingReset: false,
}),
[actions.resetDhcpSuccess.toString()]: (state: any) => ({
...state,
processingReset: false,
enabled: false,
v4: {},
v6: {},
interface_name: '',
}),
[actions.resetDhcpLeasesSuccess.toString()]: (state: any) => ({
...state,
leases: [],
staticLeases: [],
}),
[actions.toggleLeaseModal.toString()]: (state: any, { payload }: any) => {
const newState = {
...state,
isModalOpen: !state.isModalOpen,
modalType: payload?.type || '',
leaseModalConfig: payload?.config,
};
return newState;
},
[actions.addStaticLeaseRequest.toString()]: (state: any) => ({
...state,
processingAdding: true,
}),
[actions.addStaticLeaseFailure.toString()]: (state: any) => ({
...state,
processingAdding: false,
}),
[actions.addStaticLeaseSuccess.toString()]: (state: any, { payload }: any) => {
const { ip, mac, hostname } = payload;
const newLease = {
ip,
mac,
hostname: hostname || '',
};
const leases = [...state.staticLeases, newLease];
const newState = {
...state,
staticLeases: leases,
processingAdding: false,
};
return newState;
},
[actions.removeStaticLeaseRequest.toString()]: (state: any) => ({
...state,
processingDeleting: true,
}),
[actions.removeStaticLeaseFailure.toString()]: (state: any) => ({
...state,
processingDeleting: false,
}),
[actions.removeStaticLeaseSuccess.toString()]: (state: any, { payload }: any) => {
const leaseToRemove = payload.ip;
const leases = state.staticLeases.filter((item: any) => item.ip !== leaseToRemove);
const newState = {
...state,
staticLeases: leases,
processingDeleting: false,
};
return newState;
},
[actions.updateStaticLeaseRequest.toString()]: (state: any) => ({
...state,
processingUpdating: true,
}),
[actions.updateStaticLeaseFailure.toString()]: (state: any) => ({
...state,
processingUpdating: false,
}),
[actions.updateStaticLeaseSuccess.toString()]: (state: any) => {
const newState = {
...state,
processingUpdating: false,
};
return newState;
},
},
{
processing: true,
processingStatus: false,
processingInterfaces: false,
processingDhcp: false,
processingConfig: false,
processingAdding: false,
processingDeleting: false,
processingUpdating: false,
enabled: false,
interface_name: '',
check: null,
v4: {
gateway_ip: '',
subnet_mask: '',
range_start: '',
range_end: '',
lease_duration: 0,
},
v6: {
range_start: '',
lease_duration: 0,
},
leases: [],
staticLeases: [],
isModalOpen: false,
leaseModalConfig: undefined,
modalType: '',
dhcp_available: false,
},
);
export default dhcp;