Improve logic for hiding/showing spinner

OSC · Nov 21, 2024 · fccde1f · fccde1f
1 parent 40fd19d
commit fccde1f
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/apps/dashboard/app/javascript/files/data_table.js b/apps/dashboard/app/javascript/files/data_table.js
@@ -10,7 +10,7 @@ const EVENTNAME = {
 };
 
 const CONTENTID = '#directory-contents';
-const BUSYID = '#tloading-spinner';
+const SPINNERID = '#tloading_spinner';
 
 let table = null;
 
@@ -270,8 +270,7 @@ class DataTable {
     async reloadTable(url) {
         var request_url = url || history.state.currentDirectoryUrl;
 
-        $(CONTENTID).hide();
-        $(BUSYID).show();
+        this.toggleSpinner();
 
         try {
             const response = await fetch(request_url, { headers: { 'Accept': 'application/json' }, cache: 'no-store' });
@@ -303,8 +302,7 @@ class DataTable {
                 }
             });
 
-            $(BUSYID).hide();
-            $(CONTENTID).show();
+            this.toggleSpinner();
 
             return result;
         } catch (e) {
@@ -316,12 +314,19 @@ class DataTable {
             $(CONTENTID).trigger(SWAL_EVENTNAME.showError, eventData);
 
             $('#open-in-terminal-btn').addClass('disabled');
+
+            this.toggleSpinner()
 
             // Removed this as it was causing a JS Error and there is no reprocution from removing it.
             // return await Promise.reject(e);
         }
     }
 
+    toggleSpinner() {
+        document.querySelector(SPINNERID).classList.toggle('d-none');
+        document.querySelector(CONTENTID).classList.toggle('d-none');
+    }
+
     updateDotFileVisibility() {
         this.reloadTable();
     }