Skip to content

Commit 82d8713

Browse files
committed
Fix allocation display when a description is present
1 parent 47d6235 commit 82d8713

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

resources/scripts/components/dashboard/ServerRow.tsx

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { faEthernet, faHdd, faMemory, faMicrochip, faServer } from '@fortawesome
44
import { Link } from 'react-router-dom';
55
import { Server } from '@/api/server/getServer';
66
import getServerResourceUsage, { ServerPowerState, ServerStats } from '@/api/server/getServerResourceUsage';
7-
import { bytesToHuman, megabytesToHuman, formatIp } from '@/helpers';
7+
import { bytesToHuman, formatIp, megabytesToHuman } from '@/helpers';
88
import tw from 'twin.macro';
99
import GreyRowBox from '@/components/elements/GreyRowBox';
1010
import Spinner from '@/components/elements/Spinner';
@@ -87,21 +87,23 @@ export default ({ server, className }: { server: Server; className?: string }) =
8787
<div>
8888
<p css={tw`text-lg break-words`}>{server.name}</p>
8989
{!!server.description &&
90-
<p css={tw`text-sm text-neutral-300 break-words`}>{server.description}</p>
90+
<p css={tw`text-sm text-neutral-300 break-words line-clamp-2`}>{server.description}</p>
9191
}
9292
</div>
9393
</div>
94-
<div css={tw`hidden lg:col-span-2 lg:flex ml-4 justify-end h-full`}>
95-
<FontAwesomeIcon icon={faEthernet} css={tw`text-neutral-500`}/>
96-
<p css={tw`text-sm text-neutral-400 ml-2`}>
97-
{
98-
server.allocations.filter(alloc => alloc.isDefault).map(allocation => (
99-
<React.Fragment key={allocation.ip + allocation.port.toString()}>
100-
{allocation.alias || formatIp(allocation.ip)}:{allocation.port}
101-
</React.Fragment>
102-
))
103-
}
104-
</p>
94+
<div css={tw`flex-1 ml-4 lg:block lg:col-span-2 hidden`}>
95+
<div css={tw`flex justify-center`}>
96+
<FontAwesomeIcon icon={faEthernet} css={tw`text-neutral-500`}/>
97+
<p css={tw`text-sm text-neutral-400 ml-2`}>
98+
{
99+
server.allocations.filter(alloc => alloc.isDefault).map(allocation => (
100+
<React.Fragment key={allocation.ip + allocation.port.toString()}>
101+
{allocation.alias || formatIp(allocation.ip)}:{allocation.port}
102+
</React.Fragment>
103+
))
104+
}
105+
</p>
106+
</div>
105107
</div>
106108
<div css={tw`hidden col-span-7 lg:col-span-4 sm:flex items-baseline justify-center`}>
107109
{(!stats || isSuspended) ?

0 commit comments

Comments
 (0)