Merge pull request galaxyproject#19409 from jdavcs/dev_pagination_fix

Prevent negative offset
martenson · Jan 16, 2025 · 4e781cd · 4e781cd
2 parents 2411fb8 + 75cf57a
commit 4e781cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/client/src/components/FilesDialog/FilesDialog.vue b/client/src/components/FilesDialog/FilesDialog.vue
@@ -318,7 +318,7 @@ async function provideItems(ctx: ItemsProviderContext, url?: string): Promise<Se
             return [];
         }
         const limit = ctx.perPage;
-        const offset = (ctx.currentPage - 1) * ctx.perPage;
+        const offset = (ctx.currentPage ? ctx.currentPage - 1 : 0) * ctx.perPage;
         const query = ctx.filter;
         const response = await browseRemoteFiles(url, false, props.requireWritable, limit, offset, query);
         const result = response.entries.map(entryToRecord);

diff --git a/client/src/components/Grid/GridList.vue b/client/src/components/Grid/GridList.vue
@@ -174,7 +174,7 @@ async function getGridData() {
             return;
         }
         try {
-            const offset = props.limit * (currentPage.value - 1);
+            const offset = props.limit * (currentPage.value ? currentPage.value - 1 : 0);
             const [responseData, responseTotal] = await props.gridConfig.getData(
                 offset,
                 props.limit,

diff --git a/client/src/components/SelectionDialog/HistoryDatasetPicker.vue b/client/src/components/SelectionDialog/HistoryDatasetPicker.vue
@@ -153,7 +153,7 @@ async function historiesProvider(ctx: ItemsProviderContext, url?: string): Promi
         }
 
         const limit = ctx.perPage;
-        const offset = (ctx.currentPage - 1) * ctx.perPage;
+        const offset = (ctx.currentPage ? ctx.currentPage - 1 : 0) * ctx.perPage;
         const sortDesc = ctx.sortDesc;
         const sortBy: HistorySortByLiteral =
             ctx.sortBy === "label" ? "name" : (ctx.sortBy as HistorySortByLiteral) || "update_time";
@@ -201,7 +201,7 @@ async function datasetsProvider(ctx: ItemsProviderContext, selectedHistory: Hist
 
     try {
         const limit = ctx.perPage;
-        const offset = (ctx.currentPage - 1) * ctx.perPage;
+        const offset = (ctx.currentPage ? ctx.currentPage - 1 : 0) * ctx.perPage;
         const query = ctx.filter || "";
         const querySortBy = ctx.sortBy === "time" ? "update_time" : "name";
         const sortPrefix = ctx.sortDesc ? "-dsc" : "-asc";