Skip to content

Commit 3df0feb

Browse files
Less Lines = Better
Same logic, just more compact and react like
1 parent 564933f commit 3df0feb

File tree

2 files changed

+4
-29
lines changed

2 files changed

+4
-29
lines changed

resources/scripts/components/dashboard/ServerRow.tsx

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,8 @@ export default ({ server, className }: { server: Server; className: string | und
5252
alarms.memory = isAlarmState(stats.memoryUsageInBytes, server.limits.memory);
5353
alarms.disk = server.limits.disk === 0 ? false : isAlarmState(stats.diskUsageInBytes, server.limits.disk);
5454
}
55-
56-
let disklimit;
57-
let memorylimit;
58-
59-
if(server.limits.disk != 0) {
60-
disklimit = bytesToHuman(server.limits.disk * 1000 * 1000);
61-
} else {
62-
disklimit = "Unlimited";
63-
};
64-
65-
if(server.limits.memory != 0) {
66-
memorylimit = bytesToHuman(server.limits.memory * 1000 * 1000);
67-
} else {
68-
memorylimit = "Unlimited";
69-
};
55+
const disklimit = server.limits.disk != 0 ? bytesToHuman(server.limits.disk * 1000 * 1000) : "Unlimited";
56+
const memorylimit = server.limits.memory != 0 ? bytesToHuman(server.limits.memory * 1000 * 1000) : "Unlimited";
7057

7158
return (
7259
<Link to={`/server/${server.id}`} className={`grey-row-box cursor-pointer ${className}`}>

resources/scripts/components/server/ServerConsole.tsx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,8 @@ export default () => {
8181
};
8282
}, [ instance, connected ]);
8383

84-
85-
let memorylimit;
86-
let disklimit;
87-
88-
if(server.limits.disk != 0 ) {
89-
disklimit = <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>;
90-
} else {
91-
disklimit = <span className={'text-neutral-500'}> / Unlimited</span>;
92-
};
93-
if(server.limits.memory != 0 ) {
94-
memorylimit = <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>;
95-
} else {
96-
memorylimit = <span className={'text-neutral-500'}> / Unlimited</span>;
97-
};
84+
const disklimit = server.limits.disk != 0 ? bytesToHuman(server.limits.disk * 1000 * 1000) : "Unlimited";
85+
const memorylimit = server.limits.memory != 0 ? bytesToHuman(server.limits.memory * 1000 * 1000) : "Unlimited";
9886

9987
return (
10088
<PageContentBlock className={'flex'}>

0 commit comments

Comments
 (0)