Refactored delete server components

This commit is contained in:
Alejandro Celaya
2020-03-05 10:18:33 +01:00
parent ab7718e335
commit b02dcf6c53
5 changed files with 46 additions and 25 deletions

View File

@@ -24,7 +24,7 @@ const propTypes = {
showOnMobile: PropTypes.bool,
};
const AsideMenu = (DeleteServerButton) => {
const AsideMenu = (DeleteServerButton, ShlinkVersions) => {
const AsideMenu = ({ selectedServer, className, showOnMobile }) => {
const serverId = selectedServer ? selectedServer.id : '';
const asideClass = classNames('aside-menu', className, {
@@ -49,6 +49,7 @@ const AsideMenu = (DeleteServerButton) => {
<span className="aside-menu__item-text">Manage tags</span>
</AsideMenuItem>
<ShlinkVersions />
<DeleteServerButton className="aside-menu__item aside-menu__item--danger" server={selectedServer} />
</nav>
</aside>

View File

@@ -0,0 +1,16 @@
import React from 'react';
import { serverType } from '../servers/prop-types';
const propTypes = {
selectedServer: serverType,
};
const ShlinkVersions = ({ selectedServer }) => {
const { version } = selectedServer;
return <span>Server: v{version}</span>;
};
ShlinkVersions.propTypes = propTypes;
export default ShlinkVersions;

View File

@@ -4,6 +4,7 @@ import Home from '../Home';
import MenuLayout from '../MenuLayout';
import AsideMenu from '../AsideMenu';
import ErrorHandler from '../ErrorHandler';
import ShlinkVersions from '../ShlinkVersions';
const provideServices = (bottle, connect, withRouter) => {
bottle.constant('window', global.window);
@@ -30,7 +31,10 @@ const provideServices = (bottle, connect, withRouter) => {
bottle.decorator('MenuLayout', connect([ 'selectedServer', 'shortUrlsListParams' ], [ 'selectServer' ]));
bottle.decorator('MenuLayout', withRouter);
bottle.serviceFactory('AsideMenu', AsideMenu, 'DeleteServerButton');
bottle.serviceFactory('AsideMenu', AsideMenu, 'DeleteServerButton', 'ShlinkVersions');
bottle.serviceFactory('ShlinkVersions', () => ShlinkVersions);
bottle.decorator('ShlinkVersions', connect([ 'selectedServer' ]));
bottle.serviceFactory('ErrorHandler', ErrorHandler, 'window', 'console');
};