Skip to content

Commit 564933f

Browse files
Show "unlimited" not 0
Shows unlimited for resources if they're set to "0" Im sure we could also just remove the "of {limit}" part if its unlimited? Dane Advise Im sure there is a 100x better way of doing this? Dane please advise.
1 parent 6e588b3 commit 564933f

File tree

2 files changed

+34
-6
lines changed

2 files changed

+34
-6
lines changed

resources/scripts/components/dashboard/ServerRow.tsx

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,21 @@ export default ({ server, className }: { server: Server; className: string | und
5353
alarms.disk = server.limits.disk === 0 ? false : isAlarmState(stats.diskUsageInBytes, server.limits.disk);
5454
}
5555

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+
};
70+
5671
return (
5772
<Link to={`/server/${server.id}`} className={`grey-row-box cursor-pointer ${className}`}>
5873
<div className={'icon'}>
@@ -127,7 +142,7 @@ export default ({ server, className }: { server: Server; className: string | und
127142
{bytesToHuman(stats.memoryUsageInBytes)}
128143
</p>
129144
</div>
130-
<p className={'text-xs text-neutral-600 text-center mt-1'}>of {bytesToHuman(server.limits.memory * 1000 * 1000)}</p>
145+
<p className={'text-xs text-neutral-600 text-center mt-1'}>of {memorylimit}</p>
131146
</div>
132147
<div className={'flex-1 ml-4'}>
133148
<div className={'flex justify-center'}>
@@ -147,9 +162,7 @@ export default ({ server, className }: { server: Server; className: string | und
147162
{bytesToHuman(stats.diskUsageInBytes)}
148163
</p>
149164
</div>
150-
<p className={'text-xs text-neutral-600 text-center mt-1'}>
151-
of {bytesToHuman(server.limits.disk * 1000 * 1000)}
152-
</p>
165+
<p className={'text-xs text-neutral-600 text-center mt-1'}>of {disklimit}</p>
153166
</div>
154167
</React.Fragment>
155168
}

resources/scripts/components/server/ServerConsole.tsx

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,21 @@ 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+
};
98+
8499
return (
85100
<PageContentBlock className={'flex'}>
86101
<div className={'w-1/4'}>
@@ -112,7 +127,7 @@ export default () => {
112127
className={'mr-1'}
113128
/>
114129
&nbsp;{bytesToHuman(memory)}
115-
<span className={'text-neutral-500'}> / {server.limits.memory} MB</span>
130+
{memorylimit}
116131
</p>
117132
<p className={'text-xs mt-2'}>
118133
<FontAwesomeIcon
@@ -121,7 +136,7 @@ export default () => {
121136
className={'mr-1'}
122137
/>
123138
&nbsp;{bytesToHuman(disk)}
124-
<span className={'text-neutral-500'}> / {server.limits.disk} MB</span>
139+
{disklimit}
125140
</p>
126141
</TitledGreyBox>
127142
{!server.isInstalling ?

0 commit comments

Comments
 (0)