Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions src/dashboard/Data/Browser/DataBrowser.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 };
});
});
}
}
Expand Down Expand Up @@ -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}>
Expand Down
1 change: 1 addition & 0 deletions src/dashboard/Data/Browser/Databrowser.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
min-width: 0;
overflow-y: auto;
overflow-x: hidden;
position: relative;

/* Custom narrow scrollbar for webkit browsers */
&::-webkit-scrollbar {
Expand Down
Loading