IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that the lock panel should not be blocked for larger records. Fixes #6570

Browse Source
This commit is contained in:
Nikhil Mohite
2021-08-25 11:05:28 +05:30
committed by Akshay Joshi
parent e39838455e
commit 737bc6a965
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
web/pgadmin/dashboard/static/js/dashboard.js
View File

@@ -480,9 +480,17 @@ define('pgadmin.dashboard', [
$(container).data('grid', grid);
$(container).data('filter', filter);
},
__loadMoreRows: function(e) {
let elem = e.currentTarget;
if ((elem.scrollHeight - 10) < elem.scrollTop + elem.offsetHeight) {
if (this.data.length > 0) {
this.local_grid.collection.add(this.data.splice(0, 50));
}
}
},
// Render the data in a grid
render_grid_data: function(container) {
var that = this;
var data = $(container).data('data'),
grid = $(container).data('grid'),
filter = $(container).data('filter');
@@ -493,7 +501,11 @@ define('pgadmin.dashboard', [
data.fetch({
reset: true,
success: function() {
success: function(res) {
that.data = res.models;
that.local_grid = grid;
grid.collection.reset(that.data.splice(0,50));
// If we're showing an error, remove it, and replace the grid & filter
if ($(container).hasClass('grid-error')) {
$(container).removeClass('grid-error');
@@ -501,6 +513,14 @@ define('pgadmin.dashboard', [
$(filter.el).show();
}
if(that.data.length > 50) {
// Listen scroll event to load more rows
$('.pg-panel-content').on('scroll', that.__loadMoreRows.bind(that));
} else {
// Listen scroll event to load more rows
$('.pg-panel-content').off('scroll', that.__loadMoreRows);
}
// Re-apply search criteria
filter.search();
},