Migrated a lot more components to new DI system

src/common/AsideMenu.js

@@ -6,9 +6,8 @@ import React from 'react';
 import { NavLink } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import DeleteServerButton from '../servers/DeleteServerButton';
-import './AsideMenu.scss';
 import { serverType } from '../servers/prop-types';
+import './AsideMenu.scss';
 
 const defaultProps = {
   className: '',
@@ -20,51 +19,57 @@ const propTypes = {
   showOnMobile: PropTypes.bool,
 };
 
-export default function AsideMenu({ selectedServer, className, showOnMobile }) {
-  const serverId = selectedServer ? selectedServer.id : '';
-  const asideClass = classnames('aside-menu', className, {
-    'aside-menu--hidden': !showOnMobile,
-  });
-  const shortUrlsIsActive = (match, location) => location.pathname.match('/list-short-urls');
+const AsideMenu = (DeleteServerButton) => {
+  const AsideMenu = ({ selectedServer, className, showOnMobile }) => {
+    const serverId = selectedServer ? selectedServer.id : '';
+    const asideClass = classnames('aside-menu', className, {
+      'aside-menu--hidden': !showOnMobile,
+    });
+    const shortUrlsIsActive = (match, location) => location.pathname.match('/list-short-urls');
 
-  return (
-    <aside className={asideClass}>
-      <nav className="nav flex-column aside-menu__nav">
-        <NavLink
-          className="aside-menu__item"
-          activeClassName="aside-menu__item--selected"
-          to={`/server/${serverId}/list-short-urls/1`}
-          isActive={shortUrlsIsActive}
-        >
-          <FontAwesomeIcon icon={listIcon} />
-          <span className="aside-menu__item-text">List short URLs</span>
-        </NavLink>
-        <NavLink
-          className="aside-menu__item"
-          activeClassName="aside-menu__item--selected"
-          to={`/server/${serverId}/create-short-url`}
-        >
-          <FontAwesomeIcon icon={createIcon} flip="horizontal" />
-          <span className="aside-menu__item-text">Create short URL</span>
-        </NavLink>
+    return (
+      <aside className={asideClass}>
+        <nav className="nav flex-column aside-menu__nav">
+          <NavLink
+            className="aside-menu__item"
+            activeClassName="aside-menu__item--selected"
+            to={`/server/${serverId}/list-short-urls/1`}
+            isActive={shortUrlsIsActive}
+          >
+            <FontAwesomeIcon icon={listIcon} />
+            <span className="aside-menu__item-text">List short URLs</span>
+          </NavLink>
+          <NavLink
+            className="aside-menu__item"
+            activeClassName="aside-menu__item--selected"
+            to={`/server/${serverId}/create-short-url`}
+          >
+            <FontAwesomeIcon icon={createIcon} flip="horizontal" />
+            <span className="aside-menu__item-text">Create short URL</span>
+          </NavLink>
 
-        <NavLink
-          className="aside-menu__item"
-          activeClassName="aside-menu__item--selected"
-          to={`/server/${serverId}/manage-tags`}
-        >
-          <FontAwesomeIcon icon={tagsIcon} />
-          <span className="aside-menu__item-text">Manage tags</span>
-        </NavLink>
+          <NavLink
+            className="aside-menu__item"
+            activeClassName="aside-menu__item--selected"
+            to={`/server/${serverId}/manage-tags`}
+          >
+            <FontAwesomeIcon icon={tagsIcon} />
+            <span className="aside-menu__item-text">Manage tags</span>
+          </NavLink>
 
-        <DeleteServerButton
-          className="aside-menu__item aside-menu__item--danger"
-          server={selectedServer}
-        />
-      </nav>
-    </aside>
-  );
-}
+          <DeleteServerButton
+            className="aside-menu__item aside-menu__item--danger"
+            server={selectedServer}
+          />
+        </nav>
+      </aside>
+    );
+  };
 
-AsideMenu.defaultProps = defaultProps;
-AsideMenu.propTypes = propTypes;
+  AsideMenu.defaultProps = defaultProps;
+  AsideMenu.propTypes = propTypes;
+
+  return AsideMenu;
+};
+
+export default AsideMenu;

src/common/MainHeader.js

@@ -6,11 +6,10 @@ import { Link } from 'react-router-dom';
 import { Collapse, Nav, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap';
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import ServersDropdown from '../servers/ServersDropdown';
-import './MainHeader.scss';
 import shlinkLogo from './shlink-logo-white.png';
+import './MainHeader.scss';
 
-const MainHeader = () => class MainHeaderComponent extends React.Component {
+const MainHeader = (ServersDropdown) => class MainHeader extends React.Component {
   static propTypes = {
     location: PropTypes.object,
   };

src/common/MenuLayout.js

@@ -7,13 +7,10 @@ import classnames from 'classnames';
 import * as PropTypes from 'prop-types';
 import ShortUrlsVisits from '../visits/ShortUrlVisits';
 import CreateShortUrl from '../short-urls/CreateShortUrl';
-import ShortUrls from '../short-urls/ShortUrls';
 import './MenuLayout.scss';
-import TagsList from '../tags/TagsList';
 import { serverType } from '../servers/prop-types';
-import AsideMenu from './AsideMenu';
 
-export default class MenuLayout extends React.Component {
+const MenuLayout = (TagsList, ShortUrls, AsideMenu) => class MenuLayout extends React.Component {
   static propTypes = {
     match: PropTypes.object,
     selectServer: PropTypes.func,
@@ -99,4 +96,6 @@ export default class MenuLayout extends React.Component {
       </React.Fragment>
     );
   }
-}
+};
+
+export default MenuLayout;