From 0be7308b6572f2bbfbf7c952e699e57c25e4d04a Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 27 Nov 2025 19:32:34 +0100
Subject: [PATCH] fix

---
 .../Data/Browser/DataBrowser.react.js         | 37 +++++++++++++------
 src/dashboard/Data/Browser/Databrowser.scss   |  1 +
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/dashboard/Data/Browser/DataBrowser.react.js b/src/dashboard/Data/Browser/DataBrowser.react.js
index 6e3322fd4..6465b9b80 100644
--- a/src/dashboard/Data/Browser/DataBrowser.react.js
+++ b/src/dashboard/Data/Browser/DataBrowser.react.js
@@ -133,6 +133,7 @@ export default class DataBrowser extends React.Component {
       panelCount: 1, // Number of panels to display
       multiPanelData: {}, // Object mapping objectId to panel data
       _objectsToFetch: [], // Temporary field for async fetch handling
+      loadingObjectIds: new Set(),
     };
 
     this.handleResizeDiv = this.handleResizeDiv.bind(this);
@@ -1010,20 +1011,34 @@ export default class DataBrowser extends React.Component {
       };
       const options = { useMasterKey: true };
 
+      this.setState(prev => ({
+        loadingObjectIds: new Set(prev.loadingObjectIds).add(objectId)
+      }));
+
       Parse.Cloud.run(cloudCodeFunction, params, options).then(result => {
         // Store in both prefetchCache and multiPanelData
-        this.setState(prev => ({
-          prefetchCache: {
-            ...prev.prefetchCache,
-            [objectId]: { data: result, timestamp: Date.now() }
-          },
-          multiPanelData: {
-            ...prev.multiPanelData,
-            [objectId]: result
-          }
-        }));
+        this.setState(prev => {
+          const newLoading = new Set(prev.loadingObjectIds);
+          newLoading.delete(objectId);
+          return {
+            loadingObjectIds: newLoading,
+            prefetchCache: {
+              ...prev.prefetchCache,
+              [objectId]: { data: result, timestamp: Date.now() }
+            },
+            multiPanelData: {
+              ...prev.multiPanelData,
+              [objectId]: result
+            }
+          };
+        });
       }).catch(error => {
         console.error(`Failed to fetch panel data for ${objectId}:`, error);
+        this.setState(prev => {
+          const newLoading = new Set(prev.loadingObjectIds);
+          newLoading.delete(objectId);
+          return { loadingObjectIds: newLoading };
+        });
       });
     }
   }
@@ -1470,7 +1485,7 @@ export default class DataBrowser extends React.Component {
                       }
                       return this.state.displayedObjectIds.map((objectId, index) => {
                         const panelData = this.state.multiPanelData[objectId] || {};
-                        const isLoading = objectId === this.state.selectedObjectId && this.props.isLoadingCloudFunction;
+                        const isLoading = (objectId === this.state.selectedObjectId && this.props.isLoadingCloudFunction) || this.state.loadingObjectIds.has(objectId);
                         const isRowSelected = this.props.selection[objectId];
                         return (
                           <React.Fragment key={objectId}>
diff --git a/src/dashboard/Data/Browser/Databrowser.scss b/src/dashboard/Data/Browser/Databrowser.scss
index 5ffe4a065..1730a52dd 100644
--- a/src/dashboard/Data/Browser/Databrowser.scss
+++ b/src/dashboard/Data/Browser/Databrowser.scss
@@ -36,6 +36,7 @@
     min-width: 0;
     overflow-y: auto;
     overflow-x: hidden;
+    position: relative;
 
     /* Custom narrow scrollbar for webkit browsers */
     &::-webkit-scrollbar {