forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-14 11:33:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed missing initial values when editing one domain redirects

Browse Source
This commit is contained in:
Alejandro Celaya
2021-08-24 20:24:34 +02:00
parent 0804322a9f
commit 06f4cff97e
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/domains/helpers/EditDomainRedirectsModal.tsx
View File

@@ -25,9 +25,11 @@ const FormGroup: FC<FormGroupContainerProps & { isLast?: boolean }> = ({ isLast,
export const EditDomainRedirectsModal: FC<EditDomainRedirectsModalProps> = ( export const EditDomainRedirectsModal: FC<EditDomainRedirectsModalProps> = (
{ isOpen, toggle, domain, editDomainRedirects }, { isOpen, toggle, domain, editDomainRedirects },
) => { ) => {
const [ baseUrlRedirect, setBaseUrlRedirect ] = useState(''); const [ baseUrlRedirect, setBaseUrlRedirect ] = useState(domain.redirects?.baseUrlRedirect ?? '');
const [ regular404Redirect, setRegular404Redirect ] = useState(''); const [ regular404Redirect, setRegular404Redirect ] = useState(domain.redirects?.regular404Redirect ?? '');
const [ invalidShortUrlRedirect, setInvalidShortUrlRedirect ] = useState(''); const [ invalidShortUrlRedirect, setInvalidShortUrlRedirect ] = useState(
domain.redirects?.invalidShortUrlRedirect ?? '',
);
const handleSubmit = handleEventPreventingDefault(async () => editDomainRedirects(domain.domain, { const handleSubmit = handleEventPreventingDefault(async () => editDomainRedirects(domain.domain, {
baseUrlRedirect: nonEmptyValueOrNull(baseUrlRedirect), baseUrlRedirect: nonEmptyValueOrNull(baseUrlRedirect),
regular404Redirect: nonEmptyValueOrNull(regular404Redirect), regular404Redirect: nonEmptyValueOrNull(regular404Redirect),

20
test/domains/helpers/EditDomainRedirectsModal.test.tsx
View File

@@ -9,7 +9,12 @@ describe('<EditDomainRedirectsModal />', () => {
let wrapper: ShallowWrapper; let wrapper: ShallowWrapper;
const editDomainRedirects = jest.fn().mockResolvedValue(undefined); const editDomainRedirects = jest.fn().mockResolvedValue(undefined);
const toggle = jest.fn(); const toggle = jest.fn();
const domain = Mock.of<ShlinkDomain>({ domain: 'foo.com' }); const domain = Mock.of<ShlinkDomain>({
domain: 'foo.com',
redirects: {
baseUrlRedirect: 'baz',
},
});
beforeEach(() => { beforeEach(() => {
wrapper = shallow( wrapper = shallow(
@@ -51,7 +56,7 @@ describe('<EditDomainRedirectsModal />', () => {
wrapper.find('form').simulate('submit', { preventDefault: jest.fn() }); wrapper.find('form').simulate('submit', { preventDefault: jest.fn() });
expect(editDomainRedirects).toHaveBeenCalledWith('foo.com', { expect(editDomainRedirects).toHaveBeenCalledWith('foo.com', {
baseUrlRedirect: null, baseUrlRedirect: 'baz',
regular404Redirect: null, regular404Redirect: null,
invalidShortUrlRedirect: null, invalidShortUrlRedirect: null,
}); });
@@ -75,5 +80,16 @@ describe('<EditDomainRedirectsModal />', () => {
regular404Redirect: 'new_regular_404', regular404Redirect: 'new_regular_404',
invalidShortUrlRedirect: null, invalidShortUrlRedirect: null,
}); });
formGroups.at(0).simulate('change', '');
formGroups.at(1).simulate('change', '');
formGroups.at(2).simulate('change', '');
wrapper.find('form').simulate('submit', { preventDefault: jest.fn() });
expect(editDomainRedirects).toHaveBeenCalledWith('foo.com', {
baseUrlRedirect: null,
regular404Redirect: null,
invalidShortUrlRedirect: null,
});
}); });
}); });