From ef711fbd1dd2b9ddfca03c10b714e9997800e040 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 12 Mar 2023 16:46:50 -0400
Subject: [PATCH 1/4] Fix traceback for users without disks

---
 app/frontend/templates/panel/dashboard.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index 981a4163..a0927996 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -100,6 +100,7 @@
                 </div>
               </div>
             </div>
+            {% if len(data['hosts_data']['disk_json']) > 0 %}
             <div class="col-12 mt-4">
               <div class="d-flex">
                 <div class="wrapper" style="width: 100%;">
@@ -107,7 +108,7 @@
                   </h5>
                   <div id="storage_data">
                     <div class="row">
-                      {% for item in data.get('hosts_data').get('disk_json') %}
+                      {% for item in data['hosts_data']['disk_json'] %}
                       {% if item["mount"] in data["monitored"] %}
                       <div id="{{item['device']}}" class="col-xl-3 col-lg-3 col-md-4 col-12">
                         <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading"
@@ -137,6 +138,7 @@
                 </div>
               </div>
             </div>
+            {% end %}
           </div>
         </div>
       </div>
@@ -931,8 +933,8 @@
         var storage_html = '<div class="row">';
         for (i = 0; i < hostStats.disk_usage.length; i++) {
           if (hostStats.mounts.includes(hostStats.disk_usage[i].mount)) {
-            storage_html += `<div id="{{item['device']}}" class="col-xl-3 col-lg-3 col-md-4 col-12">
-                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading" id="title_{{item['device']}}" data-toggle="tooltip" data-placement="bottom" title="${hostStats.disk_usage[i].mount}" style="max-width: 100%;"><i class="fas fa-hdd"></i> ${hostStats.disk_usage[i].mount}</h4>
+            storage_html += `<div id="host_storage" class="col-xl-3 col-lg-3 col-md-4 col-12">
+                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading" id="title_host_storage" data-toggle="tooltip" data-placement="bottom" title="${hostStats.disk_usage[i].mount}" style="max-width: 100%;"><i class="fas fa-hdd"></i> ${hostStats.disk_usage[i].mount}</h4>
                         <div class="progress" style="display: inline-block; height: 20px; width: 100%; background-color: rgb(139, 139, 139) !important;">
                           <div class="progress-bar`;
             if (hostStats.disk_usage[i].percent_used <= 58) {

From c5bb1f42e2327f488a81998c92156298e9c4a8cd Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sat, 18 Mar 2023 15:27:08 -0400
Subject: [PATCH 2/4] Add try/except around disk data

---
 app/classes/minecraft/stats.py | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/classes/minecraft/stats.py b/app/classes/minecraft/stats.py
index 3d4cf483..c336612a 100644
--- a/app/classes/minecraft/stats.py
+++ b/app/classes/minecraft/stats.py
@@ -191,21 +191,25 @@ class Stats:
                     # ENOENT, pop-up a Windows GUI error for a non-ready
                     # partition or just hang.
                     continue
-            usage = psutil.disk_usage(part.mountpoint)
-            disk_data.append(
-                {
-                    "device": part.device,
-                    "total_raw": usage.total,
-                    "total": Helpers.human_readable_file_size(usage.total),
-                    "used_raw": usage.used,
-                    "used": Helpers.human_readable_file_size(usage.used),
-                    "free_raw": usage.free,
-                    "free": Helpers.human_readable_file_size(usage.free),
-                    "percent_used": usage.percent,
-                    "fs": part.fstype,
-                    "mount": part.mountpoint,
-                }
-            )
+            try:
+                usage = psutil.disk_usage(part.mountpoint)
+                disk_data.append(
+                    {
+                        "device": part.device,
+                        "total_raw": usage.total,
+                        "total": Helpers.human_readable_file_size(usage.total),
+                        "used_raw": usage.used,
+                        "used": Helpers.human_readable_file_size(usage.used),
+                        "free_raw": usage.free,
+                        "free": Helpers.human_readable_file_size(usage.free),
+                        "percent_used": usage.percent,
+                        "fs": part.fstype,
+                        "mount": part.mountpoint,
+                    }
+                )
+            except PermissionError:
+                logger.debug(f"Permission error accessing {part.mountpoint}")
+                continue
 
         return disk_data
 

From fa87dcee1a4f01c0d72399c0f1e51958d5b9c083 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Sun, 12 Mar 2023 16:46:50 -0400
Subject: [PATCH 3/4] Fix traceback for users without disks

---
 app/frontend/templates/panel/dashboard.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html
index 981a4163..a0927996 100644
--- a/app/frontend/templates/panel/dashboard.html
+++ b/app/frontend/templates/panel/dashboard.html
@@ -100,6 +100,7 @@
                 </div>
               </div>
             </div>
+            {% if len(data['hosts_data']['disk_json']) > 0 %}
             <div class="col-12 mt-4">
               <div class="d-flex">
                 <div class="wrapper" style="width: 100%;">
@@ -107,7 +108,7 @@
                   </h5>
                   <div id="storage_data">
                     <div class="row">
-                      {% for item in data.get('hosts_data').get('disk_json') %}
+                      {% for item in data['hosts_data']['disk_json'] %}
                       {% if item["mount"] in data["monitored"] %}
                       <div id="{{item['device']}}" class="col-xl-3 col-lg-3 col-md-4 col-12">
                         <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading"
@@ -137,6 +138,7 @@
                 </div>
               </div>
             </div>
+            {% end %}
           </div>
         </div>
       </div>
@@ -931,8 +933,8 @@
         var storage_html = '<div class="row">';
         for (i = 0; i < hostStats.disk_usage.length; i++) {
           if (hostStats.mounts.includes(hostStats.disk_usage[i].mount)) {
-            storage_html += `<div id="{{item['device']}}" class="col-xl-3 col-lg-3 col-md-4 col-12">
-                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading" id="title_{{item['device']}}" data-toggle="tooltip" data-placement="bottom" title="${hostStats.disk_usage[i].mount}" style="max-width: 100%;"><i class="fas fa-hdd"></i> ${hostStats.disk_usage[i].mount}</h4>
+            storage_html += `<div id="host_storage" class="col-xl-3 col-lg-3 col-md-4 col-12">
+                        <h4 class="mb-0 font-weight-semibold d-inline-block text-truncate storage-heading" id="title_host_storage" data-toggle="tooltip" data-placement="bottom" title="${hostStats.disk_usage[i].mount}" style="max-width: 100%;"><i class="fas fa-hdd"></i> ${hostStats.disk_usage[i].mount}</h4>
                         <div class="progress" style="display: inline-block; height: 20px; width: 100%; background-color: rgb(139, 139, 139) !important;">
                           <div class="progress-bar`;
             if (hostStats.disk_usage[i].percent_used <= 58) {

From 97a8bf20697f675c4b5cb28aec719aa979c249ac Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 1 Apr 2023 14:46:53 +0100
Subject: [PATCH 4/4] Update changelog !571

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8feec95..e4dd419d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Fix dashboard crash for users without disks or if crafty doesn't have permission to access mount point ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/571))
 ### Tweaks
 - Improve logging on tz failures ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/569))
 - Add fallback for ping domain to provide better feedback on internet connection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/570))