From 564933fcb1e3f89bdbae08c23aa278895f6eba01 Mon Sep 17 00:00:00 2001
From: Charles Morgan <sir3lit@gmail.com>
Date: Sat, 16 May 2020 03:16:06 -0400
Subject: [PATCH 1/3] 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.
---
 .../components/dashboard/ServerRow.tsx        | 21 +++++++++++++++----
 .../components/server/ServerConsole.tsx       | 19 +++++++++++++++--
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/resources/scripts/components/dashboard/ServerRow.tsx b/resources/scripts/components/dashboard/ServerRow.tsx
index e300e761..d6d501b1 100644
--- a/resources/scripts/components/dashboard/ServerRow.tsx
+++ b/resources/scripts/components/dashboard/ServerRow.tsx
@@ -53,6 +53,21 @@ export default ({ server, className }: { server: Server; className: string | und
         alarms.disk = server.limits.disk === 0 ? false : isAlarmState(stats.diskUsageInBytes, server.limits.disk);
     }
 
+    let disklimit;
+    let memorylimit;
+
+    if(server.limits.disk != 0) {
+        disklimit = bytesToHuman(server.limits.disk * 1000 * 1000);
+    } else {
+        disklimit = "Unlimited";
+    };
+
+    if(server.limits.memory != 0) {
+        memorylimit = bytesToHuman(server.limits.memory * 1000 * 1000);
+    } else {
+        memorylimit = "Unlimited";
+    };
+
     return (
         <Link to={`/server/${server.id}`} className={`grey-row-box cursor-pointer ${className}`}>
             <div className={'icon'}>
@@ -127,7 +142,7 @@ export default ({ server, className }: { server: Server; className: string | und
                                     {bytesToHuman(stats.memoryUsageInBytes)}
                                 </p>
                             </div>
-                            <p className={'text-xs text-neutral-600 text-center mt-1'}>of {bytesToHuman(server.limits.memory * 1000 * 1000)}</p>
+                            <p className={'text-xs text-neutral-600 text-center mt-1'}>of {memorylimit}</p>
                         </div>
                         <div className={'flex-1 ml-4'}>
                             <div className={'flex justify-center'}>
@@ -147,9 +162,7 @@ export default ({ server, className }: { server: Server; className: string | und
                                     {bytesToHuman(stats.diskUsageInBytes)}
                                 </p>
                             </div>
-                            <p className={'text-xs text-neutral-600 text-center mt-1'}>
-                                of {bytesToHuman(server.limits.disk * 1000 * 1000)}
-                            </p>
+                            <p className={'text-xs text-neutral-600 text-center mt-1'}>of {disklimit}</p>
                         </div>
                     </React.Fragment>
                 }
diff --git a/resources/scripts/components/server/ServerConsole.tsx b/resources/scripts/components/server/ServerConsole.tsx
index 5f5addf5..827cf6c3 100644
--- a/resources/scripts/components/server/ServerConsole.tsx
+++ b/resources/scripts/components/server/ServerConsole.tsx
@@ -81,6 +81,21 @@ export default () => {
         };
     }, [ instance, connected ]);
 
+
+    let memorylimit;
+    let disklimit;
+
+    if(server.limits.disk != 0 ) {
+        disklimit = <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>;
+    } else {
+        disklimit = <span className={'text-neutral-500'}> / Unlimited</span>;
+    };
+    if(server.limits.memory != 0 ) {
+        memorylimit = <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>;
+    } else {
+        memorylimit = <span className={'text-neutral-500'}> / Unlimited</span>;
+    };
+
     return (
         <PageContentBlock className={'flex'}>
             <div className={'w-1/4'}>
@@ -112,7 +127,7 @@ export default () => {
                             className={'mr-1'}
                         />
                         &nbsp;{bytesToHuman(memory)}
-                        <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>
+                        {memorylimit}
                     </p>
                     <p className={'text-xs mt-2'}>
                         <FontAwesomeIcon
@@ -121,7 +136,7 @@ export default () => {
                             className={'mr-1'}
                         />
                         &nbsp;{bytesToHuman(disk)}
-                        <span className={'text-neutral-500'}> / {server.limits.disk} MB</span>
+			            {disklimit}
                     </p>
                 </TitledGreyBox>
                 {!server.isInstalling ?

From 3df0febd0cd7e69605d0f44d2a4d668fe5623862 Mon Sep 17 00:00:00 2001
From: Charles Morgan <sir3lit@gmail.com>
Date: Sun, 17 May 2020 00:34:25 -0400
Subject: [PATCH 2/3] Less Lines = Better

Same logic, just more compact and react like
---
 .../scripts/components/dashboard/ServerRow.tsx  | 17 ++---------------
 .../scripts/components/server/ServerConsole.tsx | 16 ++--------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/resources/scripts/components/dashboard/ServerRow.tsx b/resources/scripts/components/dashboard/ServerRow.tsx
index d6d501b1..a212bce0 100644
--- a/resources/scripts/components/dashboard/ServerRow.tsx
+++ b/resources/scripts/components/dashboard/ServerRow.tsx
@@ -52,21 +52,8 @@ export default ({ server, className }: { server: Server; className: string | und
         alarms.memory = isAlarmState(stats.memoryUsageInBytes, server.limits.memory);
         alarms.disk = server.limits.disk === 0 ? false : isAlarmState(stats.diskUsageInBytes, server.limits.disk);
     }
-
-    let disklimit;
-    let memorylimit;
-
-    if(server.limits.disk != 0) {
-        disklimit = bytesToHuman(server.limits.disk * 1000 * 1000);
-    } else {
-        disklimit = "Unlimited";
-    };
-
-    if(server.limits.memory != 0) {
-        memorylimit = bytesToHuman(server.limits.memory * 1000 * 1000);
-    } else {
-        memorylimit = "Unlimited";
-    };
+    const disklimit = server.limits.disk != 0 ? bytesToHuman(server.limits.disk * 1000 * 1000) : "Unlimited";
+    const memorylimit = server.limits.memory != 0 ? bytesToHuman(server.limits.memory * 1000 * 1000) : "Unlimited";
 
     return (
         <Link to={`/server/${server.id}`} className={`grey-row-box cursor-pointer ${className}`}>
diff --git a/resources/scripts/components/server/ServerConsole.tsx b/resources/scripts/components/server/ServerConsole.tsx
index 827cf6c3..9d2e99ef 100644
--- a/resources/scripts/components/server/ServerConsole.tsx
+++ b/resources/scripts/components/server/ServerConsole.tsx
@@ -81,20 +81,8 @@ export default () => {
         };
     }, [ instance, connected ]);
 
-
-    let memorylimit;
-    let disklimit;
-
-    if(server.limits.disk != 0 ) {
-        disklimit = <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>;
-    } else {
-        disklimit = <span className={'text-neutral-500'}> / Unlimited</span>;
-    };
-    if(server.limits.memory != 0 ) {
-        memorylimit = <span className={'text-neutral-500'}> / {server.limits.memory} MB</span>;
-    } else {
-        memorylimit = <span className={'text-neutral-500'}> / Unlimited</span>;
-    };
+    const disklimit = server.limits.disk != 0 ? bytesToHuman(server.limits.disk * 1000 * 1000) : "Unlimited";
+    const memorylimit = server.limits.memory != 0 ? bytesToHuman(server.limits.memory * 1000 * 1000) : "Unlimited";
 
     return (
         <PageContentBlock className={'flex'}>

From 917a1e8a87a99add44fc11eef04c9743c0a52b67 Mon Sep 17 00:00:00 2001
From: Charles Morgan <sir3lit@gmail.com>
Date: Mon, 18 May 2020 13:33:02 -0400
Subject: [PATCH 3/3] Update ServerConsole.tsx

---
 resources/scripts/components/server/ServerConsole.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/scripts/components/server/ServerConsole.tsx b/resources/scripts/components/server/ServerConsole.tsx
index 9d2e99ef..16675b35 100644
--- a/resources/scripts/components/server/ServerConsole.tsx
+++ b/resources/scripts/components/server/ServerConsole.tsx
@@ -115,8 +115,8 @@ export default () => {
                             className={'mr-1'}
                         />
                         &nbsp;{bytesToHuman(memory)}
-                        {memorylimit}
-                    </p>
+                        <span className={'text-neutral-500'}> / {memorylimit}</span>
+                        </p>
                     <p className={'text-xs mt-2'}>
                         <FontAwesomeIcon
                             icon={faHdd}
@@ -124,7 +124,7 @@ export default () => {
                             className={'mr-1'}
                         />
                         &nbsp;{bytesToHuman(disk)}
-			            {disklimit}
+                        <span className={'text-neutral-500'}> / {disklimit}</span>
                     </p>
                 </TitledGreyBox>
                 {!server.isInstalling ?