Minor improvements

This commit is contained in:
Alejandro Celaya
2020-05-03 20:16:21 +02:00
parent 85dc1d0825
commit 241c9b73b0
6 changed files with 21 additions and 26 deletions

View File

@@ -2,20 +2,17 @@ import { isEmpty, values } from 'ramda';
import React from 'react';
import { DropdownItem, DropdownMenu, DropdownToggle, UncontrolledDropdown } from 'reactstrap';
import PropTypes from 'prop-types';
import { Link } from 'react-router-dom';
import { serverType } from './prop-types';
const propTypes = {
servers: PropTypes.object,
selectedServer: serverType,
history: PropTypes.shape({
push: PropTypes.func,
}),
};
const ServersDropdown = (serversExporter) => {
const ServersDropdownComp = ({ servers, selectedServer, history }) => {
const ServersDropdownComp = ({ servers, selectedServer }) => {
const serversList = values(servers);
const loadServer = (id) => history.push(`/server/${id}/list-short-urls/1`);
const renderServers = () => {
if (isEmpty(serversList)) {
@@ -25,7 +22,12 @@ const ServersDropdown = (serversExporter) => {
return (
<React.Fragment>
{serversList.map(({ name, id }) => (
<DropdownItem key={id} active={selectedServer && selectedServer.id === id} onClick={() => loadServer(id)}>
<DropdownItem
key={id}
tag={Link}
to={`/server/${id}/list-short-urls/1`}
active={selectedServer && selectedServer.id === id}
>
{name}
</DropdownItem>
))}