mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-09-11 10:45:42 +03:00
Pull request: fix edit static lease
Updates #6534 Squashed commit of the following: commit 1ca6cdc37a865ff0beab2d1f4fb0d44528bd4df3 Author: Ildar Kamalov <ik@adguard.com> Date: Wed Dec 20 15:41:27 2023 +0300 ADG-7889 fix edit static lease
This commit is contained in:
parent
0920bb99fe
commit
38b3ec19cc
@ -33,12 +33,14 @@ NOTE: Add new changes BELOW THIS COMMENT.
|
|||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
- Pre-filling the Edit static lease window with data ([#6534]).
|
||||||
- Names defined in the `/etc/hosts` for a single address family wrongly
|
- Names defined in the `/etc/hosts` for a single address family wrongly
|
||||||
considered undefined for another family ([#6541]).
|
considered undefined for another family ([#6541]).
|
||||||
- Omitted CNAME records in safe search results, which can cause YouTube to not
|
- Omitted CNAME records in safe search results, which can cause YouTube to not
|
||||||
work on iOS ([#6352]).
|
work on iOS ([#6352]).
|
||||||
|
|
||||||
[#6352]: https://github.com/AdguardTeam/AdGuardHome/issues/6352
|
[#6352]: https://github.com/AdguardTeam/AdGuardHome/issues/6352
|
||||||
|
[#6534]: https://github.com/AdguardTeam/AdGuardHome/issues/6534
|
||||||
[#6541]: https://github.com/AdguardTeam/AdGuardHome/issues/6541
|
[#6541]: https://github.com/AdguardTeam/AdGuardHome/issues/6541
|
||||||
[#6545]: https://github.com/AdguardTeam/AdGuardHome/issues/6545
|
[#6545]: https://github.com/AdguardTeam/AdGuardHome/issues/6545
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ import { connect } from 'react-redux';
|
|||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import ReactTable from 'react-table';
|
import ReactTable from 'react-table';
|
||||||
import { Trans, withTranslation } from 'react-i18next';
|
import { Trans, withTranslation } from 'react-i18next';
|
||||||
import { LEASES_TABLE_DEFAULT_PAGE_SIZE } from '../../../helpers/constants';
|
import { LEASES_TABLE_DEFAULT_PAGE_SIZE, MODAL_TYPE } from '../../../helpers/constants';
|
||||||
import { sortIp } from '../../../helpers/helpers';
|
import { sortIp } from '../../../helpers/helpers';
|
||||||
import { toggleLeaseModal } from '../../../actions';
|
import { toggleLeaseModal } from '../../../actions';
|
||||||
|
|
||||||
@ -18,7 +18,10 @@ class Leases extends Component {
|
|||||||
|
|
||||||
convertToStatic = (data) => () => {
|
convertToStatic = (data) => () => {
|
||||||
const { dispatch } = this.props;
|
const { dispatch } = this.props;
|
||||||
dispatch(toggleLeaseModal(data));
|
dispatch(toggleLeaseModal({
|
||||||
|
type: MODAL_TYPE.ADD_LEASE,
|
||||||
|
config: data,
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
makeStatic = ({ row }) => {
|
makeStatic = ({ row }) => {
|
||||||
|
@ -181,6 +181,7 @@ export const MODAL_TYPE = {
|
|||||||
ADD_REWRITE: 'ADD_REWRITE',
|
ADD_REWRITE: 'ADD_REWRITE',
|
||||||
EDIT_REWRITE: 'EDIT_REWRITE',
|
EDIT_REWRITE: 'EDIT_REWRITE',
|
||||||
EDIT_LEASE: 'EDIT_LEASE',
|
EDIT_LEASE: 'EDIT_LEASE',
|
||||||
|
ADD_LEASE: 'ADD_LEASE',
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CLIENT_ID = {
|
export const CLIENT_ID = {
|
||||||
|
@ -128,7 +128,8 @@ const dhcp = handleActions(
|
|||||||
const newState = {
|
const newState = {
|
||||||
...state,
|
...state,
|
||||||
isModalOpen: !state.isModalOpen,
|
isModalOpen: !state.isModalOpen,
|
||||||
leaseModalConfig: payload,
|
modalType: payload?.type || '',
|
||||||
|
leaseModalConfig: payload?.config,
|
||||||
};
|
};
|
||||||
return newState;
|
return newState;
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user