From 6db6c866995ad805578ff8bfe0a3e13352771fc1 Mon Sep 17 00:00:00 2001
From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com>
Date: Wed, 26 Aug 2026 02:07:51 +0300
Subject: [PATCH 1/4] fix(2163): Saved to local storage

---
 GUI/src/components/ServicesTable/index.tsx | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/GUI/src/components/ServicesTable/index.tsx b/GUI/src/components/ServicesTable/index.tsx
index 2daff8cf4..30c84dbac 100644
--- a/GUI/src/components/ServicesTable/index.tsx
+++ b/GUI/src/components/ServicesTable/index.tsx
@@ -15,6 +15,15 @@ type ServicesTableProps = {
   isCommon?: boolean;
 };
 
+const DEFAULT_PAGE_SIZE = 10;
+const PAGE_SIZE_OPTIONS = new Set([10, 20, 30, 50]);
+const PAGE_SIZE_STORAGE_KEY = 'page-size';
+
+const getStoredPageSize = (): number => {
+  const stored = Number(localStorage.getItem(PAGE_SIZE_STORAGE_KEY));
+  return PAGE_SIZE_OPTIONS.has(stored) ? stored : DEFAULT_PAGE_SIZE;
+};
+
 const ServicesTable: FC<ServicesTableProps> = ({ isCommon = false }) => {
   const { t } = useTranslation();
   const [isDeletePopupVisible, setIsDeletePopupVisible] = useState(false);
@@ -22,7 +31,7 @@ const ServicesTable: FC<ServicesTableProps> = ({ isCommon = false }) => {
   const navigate = useNavigate();
   const [pagination, setPagination] = useState<PaginationState>({
     pageIndex: 0,
-    pageSize: 10,
+    pageSize: getStoredPageSize(),
   });
   const [sorting, setSorting] = useState<SortingState>([{ id: 'name', desc: false }]);
 
@@ -121,6 +130,9 @@ const ServicesTable: FC<ServicesTableProps> = ({ isCommon = false }) => {
         sorting={sorting}
         setPagination={(state: PaginationState) => {
           if (state.pageIndex === pagination.pageIndex && state.pageSize === pagination.pageSize) return;
+          if (state.pageSize !== pagination.pageSize) {
+            localStorage.setItem(PAGE_SIZE_STORAGE_KEY, String(state.pageSize));
+          }
           setPagination(state);
           if (isCommon) {
             loadCommonServices(state, sorting);
@@ -137,7 +149,7 @@ const ServicesTable: FC<ServicesTableProps> = ({ isCommon = false }) => {
           }
         }}
         isClientSide={false}
-        pagesCount={services[services.length - 1]?.totalPages ?? 1}
+        pagesCount={services.at(-1)?.totalPages ?? 1}
       />
     </Card>
   );

From 7be76e6e8bdeed565f1c44cdbb3f680a2fff1a19 Mon Sep 17 00:00:00 2001
From: ffrose <119657383+ffrose@users.noreply.github.com>
Date: Wed, 26 Aug 2026 11:29:04 +0300
Subject: [PATCH 2/4] Update ci-build-image.yml

---
 .github/workflows/ci-build-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml
index dc4fa270a..f20b30c01 100644
--- a/.github/workflows/ci-build-image.yml
+++ b/.github/workflows/ci-build-image.yml
@@ -2,7 +2,7 @@ name: Build and publish GUI
 
 on:
   push:
-    branches: [ v3.3.1 ]
+    branches: [ v3.3.2 ]
     paths:
       - '.env.gui'
 

From 4f65fae6472bb1b0df357a6cdf5341352a3c0276 Mon Sep 17 00:00:00 2001
From: ffrose <119657383+ffrose@users.noreply.github.com>
Date: Thu, 27 Aug 2026 14:16:46 +0300
Subject: [PATCH 3/4] Update .env.gui

---
 .env.gui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.gui b/.env.gui
index dc1dd4e5f..410a658b3 100644
--- a/.env.gui
+++ b/.env.gui
@@ -1,4 +1,4 @@
 RELEASE=PRE-ALPHA-test
 VERSION=3
 BUILD=3
-FIX=3-test
+FIX=4-test

From 9908d4ca5383d6b10f1f0148e4b5f7111fbaf620 Mon Sep 17 00:00:00 2001
From: ffrose <119657383+ffrose@users.noreply.github.com>
Date: Thu, 3 Sep 2026 10:59:38 +0300
Subject: [PATCH 4/4] Update release.env

---
 release.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.env b/release.env
index b5d6c89a2..404f0a6b8 100644
--- a/release.env
+++ b/release.env
@@ -1,4 +1,4 @@
 main
 MAJOR=3
 MINOR=3
-PATCH=1
+PATCH=2