Skip to content

VCST-5014: Fix 20 entries limitation #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OlegoO merged 1 commit into from
Apr 29, 2026
Merged

VCST-5014: Fix 20 entries limitation #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/VirtoCommerce.SqlQueries.Web/Scripts/blades/sql-query-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<div class="blade-static __bottom"
ng-if="pageSettings.itemsPerPageCount < pageSettings.totalItems"
ng-include="'pagerTemplate.html'"></div>
<div class="blade-content __xlarge-wide">
<div class="blade-inner">
<div class="inner-block">
Expand Down
18 changes: 13 additions & 5 deletions src/VirtoCommerce.SqlQueries.Web/Scripts/blades/sql-query-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ angular.module('VirtoCommerce.SqlQueriesModule')
.controller('VirtoCommerce.SqlQueriesModule.sqlQueryListController',
[
'$scope',
'platformWebApp.bladeNavigationService', 'platformWebApp.dialogService', 'uiGridConstants', 'platformWebApp.uiGridHelper',
'platformWebApp.bladeNavigationService', 'platformWebApp.dialogService', 'uiGridConstants', 'platformWebApp.uiGridHelper', 'platformWebApp.bladeUtils',
'VirtoCommerce.SqlQueriesModule.sqlQueriesApi',
function (
$scope,
bladeNavigationService, dialogService, uiGridConstants, uiGridHelper,
bladeNavigationService, dialogService, uiGridConstants, uiGridHelper, bladeUtils,
sqlQueriesApi)
{
$scope.uiGridConstants = uiGridConstants;
Expand All @@ -16,14 +16,20 @@ angular.module('VirtoCommerce.SqlQueriesModule')

blade.refresh = function () {
blade.isLoading = true;
sqlQueriesApi.search({}, function (data) {
const searchCriteria = {
skip: ($scope.pageSettings.currentPage - 1) * $scope.pageSettings.itemsPerPageCount,
take: $scope.pageSettings.itemsPerPageCount
};
sqlQueriesApi.search(searchCriteria, function (data) {
blade.currentEntities = data.results;
$scope.pageSettings.totalItems = data.totalCount;
blade.isLoading = false;
}, function (error) {
if (error.status === 403) {
// Fall back to reports endpoint for users without read permission
sqlQueriesApi.reports({}, function (data) {
sqlQueriesApi.reports(searchCriteria, function (data) {
blade.currentEntities = data.results;
$scope.pageSettings.totalItems = data.totalCount;
blade.isLoading = false;
}, function (error2) {
bladeNavigationService.setError('Error ' + error2.status, blade);
Expand Down Expand Up @@ -123,7 +129,9 @@ angular.module('VirtoCommerce.SqlQueriesModule')
uiGridHelper.initialize($scope, gridOptions);
};

blade.refresh();
// Initializes $scope.pageSettings and a $watch on currentPage that calls blade.refresh().
// The watcher fires on first digest, so an explicit blade.refresh() is not needed here.
bladeUtils.initializePagination($scope);
}
]
);
Loading