From 83a22ab19d0095b6e1bbeaeb036679c3f536b818 Mon Sep 17 00:00:00 2001
From: Linh Nguyen <linhnguyen@mozilla.com>
Date: Wed, 15 May 2024 11:03:51 -0700
Subject: [PATCH] Fix off-by-zero error in table pagination (#2822)

---
 src/components/controls/Pagination.svelte | 4 ++--
 src/components/table/TableView.svelte     | 2 +-
 src/state/store.js                        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/controls/Pagination.svelte b/src/components/controls/Pagination.svelte
index 9f2e6e74d..c6c3b0dcf 100644
--- a/src/components/controls/Pagination.svelte
+++ b/src/components/controls/Pagination.svelte
@@ -39,7 +39,7 @@
     <Button
       tooltip="move back a page"
       on:click={() =>
-        currentPage === 1 ? undefined : changePage(currentPage - 1)}
+        currentPage === 0 ? undefined : changePage(currentPage - 1)}
       level="medium"
       compact
     >
@@ -55,7 +55,7 @@
     </Button>
   </ButtonGroup>
   page
-  {currentPage < 9 ? '0' : ''}{currentPage}
+  {currentPage < 9 ? '0' : ''}{Number(currentPage) + 1}
   of
   {totalPages < 9 ? '0' : ''}{totalPages}
 </div>
diff --git a/src/components/table/TableView.svelte b/src/components/table/TableView.svelte
index 74336cb0f..976a83ad6 100644
--- a/src/components/table/TableView.svelte
+++ b/src/components/table/TableView.svelte
@@ -85,7 +85,7 @@
     <Pagination
       on:page={(evt) => {
         currentPage = evt.detail.page;
-        store.setField('currentPage', currentPage);
+        store.setField('currentPage', currentPage || 0);
       }}
       {totalPages}
       currentPage={Number($store.currentPage)}
diff --git a/src/state/store.js b/src/state/store.js
index da5c1d84a..3e6250061 100644
--- a/src/state/store.js
+++ b/src/state/store.js
@@ -45,7 +45,7 @@ function getDefaultState(
 
   state.aggKey = getFromQueryString('aggKey') || '';
   state.aggType = getFromQueryString('aggType') || 'avg';
-  state.currentPage = getFromQueryString('currentPage') || '1';
+  state.currentPage = getFromQueryString('currentPage');
   state.countView = getFromQueryString('countView') || 'clients';
 
   state.probe = {