#325 Updated to react 17

test/App.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Route } from 'react-router-dom';
 import { identity } from 'ramda';

test/common/AsideMenu.test.tsx

@@ -1,5 +1,4 @@
 import { shallow, ShallowWrapper } from 'enzyme';
-import React from 'react';
 import { Mock } from 'ts-mockery';
 import asideMenuCreator from '../../src/common/AsideMenu';
 import { ServerWithId } from '../../src/servers/data';

test/common/ErrorHandler.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Button } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/common/Home.test.tsx

@@ -1,5 +1,4 @@
 import { shallow, ShallowWrapper } from 'enzyme';
-import React from 'react';
 import { Mock } from 'ts-mockery';
 import Home, { HomeProps } from '../../src/common/Home';
 import { ServerWithId } from '../../src/servers/data';

test/common/NotFound.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Link } from 'react-router-dom';
 import NotFound from '../../src/common/NotFound';

test/common/ScrollToTop.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import { RouteComponentProps } from 'react-router';

test/common/ShlinkVersions.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import ShlinkVersions, { ShlinkVersionsProps } from '../../src/common/ShlinkVersions';

test/common/SimplePaginator.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { identity } from 'ramda';
 import { PaginationItem } from 'reactstrap';
@@ -8,7 +7,6 @@ import { ELLIPSIS } from '../../src/utils/helpers/pagination';
 describe('<SimplePaginator />', () => {
   let wrapper: ShallowWrapper;
   const createWrapper = (pagesCount: number, currentPage = 1) => {
-    // @ts-expect-error
     wrapper = shallow(<SimplePaginator pagesCount={pagesCount} currentPage={currentPage} setCurrentPage={identity} />);
 
     return wrapper;

test/servers/CreateServer.test.tsx

@@ -1,6 +1,4 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
-import { identity } from 'ramda';
 import { Mock } from 'ts-mockery';
 import { History } from 'history';
 import createServerConstruct from '../../src/servers/CreateServer';
@@ -18,9 +16,7 @@ describe('<CreateServer />', () => {
       .mockReturnValueOnce([ importFailed, () => '' ]);
     const CreateServer = createServerConstruct(ImportServersBtn, useStateFlagTimeout);
 
-    wrapper = shallow(
-      <CreateServer createServer={createServerMock} resetSelectedServer={identity} history={historyMock} />,
-    );
+    wrapper = shallow(<CreateServer createServer={createServerMock} history={historyMock} />);
 
     return wrapper;
   };

test/servers/DeleteServerButton.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import deleteServerButtonConstruct from '../../src/servers/DeleteServerButton';

test/servers/DeleteServerModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
 import { History } from 'history';

test/servers/EditServer.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import { History, Location } from 'history';

test/servers/ServersDropdown.test.tsx

@@ -1,6 +1,6 @@
 import { values } from 'ramda';
 import { Mock } from 'ts-mockery';
-import React, { FC } from 'react';
+import { FC } from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { DropdownItem, DropdownToggle } from 'reactstrap';
 import serversDropdownCreator, { ServersDropdownProps } from '../../src/servers/ServersDropdown';

test/servers/ServersListGroup.test.tsx

@@ -1,5 +1,4 @@
 import { shallow, ShallowWrapper } from 'enzyme';
-import React from 'react';
 import { ListGroup } from 'reactstrap';
 import { Mock } from 'ts-mockery';
 import ServersListGroup from '../../src/servers/ServersListGroup';

test/servers/helpers/ForServerVersion.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import ForServerVersion from '../../../src/servers/helpers/ForServerVersion';

test/servers/helpers/ImportServersBtn.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { UncontrolledTooltip } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/servers/helpers/ServerError.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { BrowserRouter } from 'react-router-dom';
 import { Mock } from 'ts-mockery';

test/servers/helpers/ServerForm.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { ServerForm } from '../../../src/servers/helpers/ServerForm';
 import { HorizontalFormGroup } from '../../../src/utils/HorizontalFormGroup';

test/short-urls/CreateShortUrl.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import moment from 'moment';
 import { identity } from 'ramda';

test/short-urls/Paginator.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { PaginationItem } from 'reactstrap';
 import Paginator from '../../src/short-urls/Paginator';

test/short-urls/SearchBar.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import searchBarCreator from '../../src/short-urls/SearchBar';

test/short-urls/ShortUrls.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import shortUrlsCreator from '../../src/short-urls/ShortUrls';

test/short-urls/ShortUrlsList.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faCaretDown as caretDownIcon, faCaretUp as caretUpIcon } from '@fortawesome/free-solid-svg-icons';

test/short-urls/UseExistingIfFoundInfoIcon.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Modal } from 'reactstrap';

test/short-urls/helpers/CreateShortUrlResult.test.tsx

@@ -1,6 +1,4 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
-import { identity } from 'ramda';
 import CopyToClipboard from 'react-copy-to-clipboard';
 import { Tooltip } from 'reactstrap';
 import { Mock } from 'ts-mockery';
@@ -15,7 +13,7 @@ describe('<CreateShortUrlResult />', () => {
   const CreateShortUrlResult = createCreateShortUrlResult(useStateFlagTimeout);
   const createWrapper = (result: ShortUrl | null = null, error = false) => {
     wrapper = shallow(
-      <CreateShortUrlResult resetCreateShortUrl={identity} result={result} error={error} saving={false} />,
+      <CreateShortUrlResult resetCreateShortUrl={() => {}} result={result} error={error} saving={false} />,
     );
 
     return wrapper;

test/short-urls/helpers/DeleteShortUrlModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { identity } from 'ramda';
 import { Mock } from 'ts-mockery';

test/short-urls/helpers/EditMetaModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { FormGroup } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/short-urls/helpers/EditShortUrlModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { FormGroup } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/short-urls/helpers/EditTagsModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Modal } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/short-urls/helpers/PreviewModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { ExternalLink } from 'react-external-link';
 import { Mock } from 'ts-mockery';

test/short-urls/helpers/QrCodeModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { ExternalLink } from 'react-external-link';
 import { Mock } from 'ts-mockery';

test/short-urls/helpers/ShortUrlVisitsCount.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { UncontrolledTooltip } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/short-urls/helpers/ShortUrlsRow.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import moment from 'moment';
 import Moment from 'react-moment';

test/short-urls/helpers/ShortUrlsRowMenu.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { ButtonDropdown, DropdownItem } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/short-urls/helpers/VisitStatsLink.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Link } from 'react-router-dom';
 import { Mock } from 'ts-mockery';

test/tags/TagCard.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Link } from 'react-router-dom';
 import { Mock } from 'ts-mockery';

test/tags/TagsList.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { identity } from 'ramda';
 import { Mock } from 'ts-mockery';

test/tags/helpers/DeleteTagConfirmModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Modal, ModalBody, ModalFooter } from 'reactstrap';
 import DeleteTagConfirmModal from '../../../src/tags/helpers/DeleteTagConfirmModal';

test/utils/Checkbox.test.tsx

@@ -1,4 +1,4 @@
-import React, { ChangeEvent, PropsWithChildren } from 'react';
+import { ChangeEvent, PropsWithChildren } from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import Checkbox from '../../src/utils/Checkbox';

test/utils/DateInput.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import moment from 'moment';

test/utils/DateRangeRow.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import DateRangeRow from '../../src/utils/DateRangeRow';
 import DateInput from '../../src/utils/DateInput';

test/utils/SortingDropdown.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { DropdownItem } from 'reactstrap';
 import { identity, values } from 'ramda';

test/visits/ShortUrlVisits.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { identity } from 'ramda';
 import { Mock } from 'ts-mockery';

test/visits/ShortUrlVisitsHeader.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import Moment from 'react-moment';
 import { ExternalLink } from 'react-external-link';

test/visits/TagVisits.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import { History } from 'history';

test/visits/TagVisitsHeader.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import Tag from '../../src/tags/helpers/Tag';

test/visits/VisitsHeader.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import VisitsHeader from '../../src/visits/VisitsHeader';

test/visits/VisitsStats.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Card, Progress } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/visits/VisitsTable.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import VisitsTable from '../../src/visits/VisitsTable';

test/visits/helpers/DefaultChart.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Doughnut, HorizontalBar } from 'react-chartjs-2';
 import { keys, values } from 'ramda';

test/visits/helpers/GraphCard.test.tsx

@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+import { ReactNode } from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Card, CardBody, CardHeader, CardFooter } from 'reactstrap';
 import GraphCard from '../../../src/visits/helpers/GraphCard';

test/visits/helpers/LineChartCard.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { CardHeader, DropdownItem } from 'reactstrap';
 import { Line } from 'react-chartjs-2';

test/visits/helpers/MapModal.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Modal } from 'reactstrap';
 import { Marker, Popup } from 'react-leaflet';

test/visits/helpers/OpenMapModalBtn.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { Dropdown, DropdownItem, UncontrolledTooltip } from 'reactstrap';
 import { Mock } from 'ts-mockery';

test/visits/helpers/SortableBarGraph.test.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { shallow, ShallowWrapper } from 'enzyme';
 import { range } from 'ramda';
 import SortableBarGraph from '../../../src/visits/helpers/SortableBarGraph';