From 401bb208686d1678a805426c70722cb92ac7ac97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Thu, 5 Oct 2023 16:18:35 +0200
Subject: [PATCH 1/2] Revert "Take user prefered list size into account in
 systems lists pages"

This reverts commit 25d1306680005d5cc12d909e179f45a1aab59af6.
---
 .../manager/webui/templates/systems/all-list.jade     |  1 -
 .../manager/webui/templates/systems/virtual-list.jade |  1 -
 java/spacewalk-java.changes.cbosdo.page-size          |  1 -
 web/html/src/manager/systems/all-list.renderer.tsx    | 11 ++---------
 web/html/src/manager/systems/all-list.tsx             |  2 --
 .../src/manager/systems/virtual-list.renderer.tsx     |  5 ++---
 web/html/src/manager/systems/virtual-list.tsx         |  2 --
 web/spacewalk-web.changes.cbosdo.page-size            |  1 -
 8 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 java/spacewalk-java.changes.cbosdo.page-size
 delete mode 100644 web/spacewalk-web.changes.cbosdo.page-size

diff --git a/java/code/src/com/suse/manager/webui/templates/systems/all-list.jade b/java/code/src/com/suse/manager/webui/templates/systems/all-list.jade
index 650cfc2b2c4f..ea925c57636a 100644
--- a/java/code/src/com/suse/manager/webui/templates/systems/all-list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/systems/all-list.jade
@@ -13,7 +13,6 @@ script(type='text/javascript').
             module.renderer(
                 'systems-all-list', '#{docsLocale}',
                 {
-                    pageSize: #{pageSize},
                     isAdmin: #{is_admin},
                     queryColumn: #{queryColumn},
                     query: !{query}
diff --git a/java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade b/java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade
index 6288df10276b..cdf32703f247 100644
--- a/java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade
@@ -13,7 +13,6 @@ script(type='text/javascript').
             module.renderer(
                 'systems-virtual-list', '#{docsLocale}',
                 {
-                    pageSize: #{pageSize},
                     isAdmin: #{is_admin}
                 }
             )
diff --git a/java/spacewalk-java.changes.cbosdo.page-size b/java/spacewalk-java.changes.cbosdo.page-size
deleted file mode 100644
index 95ac2c86f4c5..000000000000
--- a/java/spacewalk-java.changes.cbosdo.page-size
+++ /dev/null
@@ -1 +0,0 @@
-- Take user prefered page size into account in systems lists
diff --git a/web/html/src/manager/systems/all-list.renderer.tsx b/web/html/src/manager/systems/all-list.renderer.tsx
index 02e002843630..a69bcc544fee 100644
--- a/web/html/src/manager/systems/all-list.renderer.tsx
+++ b/web/html/src/manager/systems/all-list.renderer.tsx
@@ -7,23 +7,16 @@ import { MessagesContainer } from "components/toastr";
 import { AllSystems } from "./all-list";
 
 type RendererProps = {
-  pageSize: number;
   isAdmin: boolean;
   queryColumn?: string;
   query?: string;
 };
 
-export const renderer = (id: string, docsLocale: string, { pageSize, isAdmin, queryColumn, query }: RendererProps) =>
+export const renderer = (id: string, docsLocale: string, { isAdmin, queryColumn, query }: RendererProps) =>
   SpaRenderer.renderNavigationReact(
     <>
       <MessagesContainer />
-      <AllSystems
-        docsLocale={docsLocale}
-        pageSize={pageSize}
-        isAdmin={isAdmin}
-        queryColumn={queryColumn}
-        query={query}
-      />
+      <AllSystems docsLocale={docsLocale} isAdmin={isAdmin} queryColumn={queryColumn} query={query} />
     </>,
     document.getElementById(id)
   );
diff --git a/web/html/src/manager/systems/all-list.tsx b/web/html/src/manager/systems/all-list.tsx
index 36fa92443822..fdabc0ebc725 100644
--- a/web/html/src/manager/systems/all-list.tsx
+++ b/web/html/src/manager/systems/all-list.tsx
@@ -13,7 +13,6 @@ import { SystemsListFilter } from "./list-filter";
 type Props = {
   /** Locale of the help links */
   docsLocale: string;
-  pageSize: number;
   isAdmin: boolean;
   queryColumn?: string;
   query?: string;
@@ -55,7 +54,6 @@ export function AllSystems(props: Props) {
         searchField={<SystemsListFilter />}
         defaultSearchField={props.queryColumn || "server_name"}
         initialSearch={props.query}
-        initialItemsPerPage={props.pageSize}
         emptyText={t("No Systems.")}
       >
         <Column
diff --git a/web/html/src/manager/systems/virtual-list.renderer.tsx b/web/html/src/manager/systems/virtual-list.renderer.tsx
index 00ba18ee56f5..472649e18ccf 100644
--- a/web/html/src/manager/systems/virtual-list.renderer.tsx
+++ b/web/html/src/manager/systems/virtual-list.renderer.tsx
@@ -7,15 +7,14 @@ import { MessagesContainer } from "components/toastr";
 import { VirtualSystems } from "./virtual-list";
 
 type RendererProps = {
-  pageSize: number;
   isAdmin: boolean;
 };
 
-export const renderer = (id: string, docsLocale: string, { pageSize, isAdmin }: RendererProps) =>
+export const renderer = (id: string, docsLocale: string, { isAdmin }: RendererProps) =>
   SpaRenderer.renderNavigationReact(
     <>
       <MessagesContainer />
-      <VirtualSystems docsLocale={docsLocale} pageSize={pageSize} isAdmin={isAdmin} />
+      <VirtualSystems docsLocale={docsLocale} isAdmin={isAdmin} />
     </>,
     document.getElementById(id)
   );
diff --git a/web/html/src/manager/systems/virtual-list.tsx b/web/html/src/manager/systems/virtual-list.tsx
index a474a6129bbb..88fa62878b13 100644
--- a/web/html/src/manager/systems/virtual-list.tsx
+++ b/web/html/src/manager/systems/virtual-list.tsx
@@ -13,7 +13,6 @@ import Network from "utils/network";
 type Props = {
   /** Locale of the help links */
   docsLocale: string;
-  pageSize: number;
   isAdmin: boolean;
 };
 
@@ -54,7 +53,6 @@ export function VirtualSystems(props: Props) {
         data="/rhn/manager/api/systems/list/virtual"
         identifier={(item) => item.virtualSystemId || item.uuid}
         initialSortColumnKey="hostServerName"
-        initialItemsPerPage={props.pageSize}
         selectable={(item) => item.hasOwnProperty("virtualSystemId")}
         selectedItems={selectedSystems}
         onSelect={handleSelectedSystems}
diff --git a/web/spacewalk-web.changes.cbosdo.page-size b/web/spacewalk-web.changes.cbosdo.page-size
deleted file mode 100644
index 95ac2c86f4c5..000000000000
--- a/web/spacewalk-web.changes.cbosdo.page-size
+++ /dev/null
@@ -1 +0,0 @@
-- Take user prefered page size into account in systems lists

From 52b59767a6dfeb27f3e69d59d74d1a0be18ce83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Thu, 5 Oct 2023 17:11:13 +0200
Subject: [PATCH 2/2] Move the pageSize setting to the JSP level

Setting the pageSize as a global variable in the window object from Jade
doesn't work. Moving it to the layout_head.jsp with the other variables
ensures it is defined when the ReactJS code is used.
---
 .../contentmanagement/templates/list-filters.jade    |  1 -
 .../contentmanagement/templates/list-projects.jade   |  1 -
 .../com/suse/manager/webui/templates/audit/cve.jade  |  2 --
 .../src/com/suse/manager/webui/templates/common.jade |  4 ----
 .../templates/content_management/list-profiles.jade  |  2 --
 .../templates/content_management/list-stores.jade    |  2 --
 .../webui/templates/content_management/view.jade     |  2 --
 .../webui/templates/formula_catalog/list.jade        |  2 --
 .../suse/manager/webui/templates/minion/list.jade    |  1 -
 .../webui/templates/notification-messages/list.jade  |  2 --
 .../suse/manager/webui/templates/packages/list.jade  |  1 -
 .../suse/manager/webui/templates/products/show.jade  |  2 --
 .../templates/schedule/maintenance-windows.jade      |  2 --
 .../webui/templates/schedule/recurring-actions.jade  |  2 --
 .../webui/templates/subscription-matching/show.jade  |  1 -
 .../manager/webui/templates/systems/all-list.jade    |  1 -
 .../webui/templates/systems/virtual-list.jade        |  1 -
 .../suse/manager/webui/templates/taskotop/show.jade  |  2 --
 .../webui/templates/virtualhostmanager/list.jade     |  2 --
 .../templates/virtualization/guests/create.jade      |  1 -
 .../webui/templates/virtualization/guests/edit.jade  |  1 -
 .../webui/templates/virtualization/guests/show.jade  |  2 --
 .../webui/templates/virtualization/nets/create.jade  |  1 -
 .../webui/templates/virtualization/nets/edit.jade    |  1 -
 .../webui/templates/virtualization/nets/show.jade    |  2 --
 .../webui/templates/virtualization/pools/create.jade |  1 -
 .../webui/templates/virtualization/pools/edit.jade   |  1 -
 .../webui/templates/virtualization/pools/show.jade   |  1 -
 .../manager/webui/utils/UserPreferenceUtils.java     | 12 ++++++++++++
 java/code/webapp/WEB-INF/decorators/layout_head.jsp  |  2 ++
 java/spacewalk-java.changes.cbosdo.page-size         |  1 +
 web/html/src/manager/virtualization/ListTab.tsx      |  2 --
 .../guests/list/guests-list.renderer.tsx             |  7 +------
 .../virtualization/guests/list/guests-list.tsx       |  2 --
 .../virtualization/nets/list/nets-list.renderer.tsx  | 10 ++--------
 .../manager/virtualization/nets/list/nets-list.tsx   |  2 --
 .../pools/list/pools-list.renderer.tsx               |  5 ++---
 .../manager/virtualization/pools/list/pools-list.tsx |  2 --
 web/spacewalk-web.changes.cbosdo.page-size           |  1 +
 39 files changed, 21 insertions(+), 69 deletions(-)
 create mode 100644 java/spacewalk-java.changes.cbosdo.page-size
 create mode 100644 web/spacewalk-web.changes.cbosdo.page-size

diff --git a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/templates/list-filters.jade b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/templates/list-filters.jade
index 372e0ec1b8f6..3ed2b2c28206 100644
--- a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/templates/list-filters.jade
+++ b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/templates/list-filters.jade
@@ -2,7 +2,6 @@ include /templates/common.jade
 
 +userRoles
 +userLocalization
-+userPreferences
 
 #content-management-list-filters
 
diff --git a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/templates/list-projects.jade b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/templates/list-projects.jade
index 7a1a0c55c427..3250b5dc288e 100644
--- a/java/code/src/com/suse/manager/webui/controllers/contentmanagement/templates/list-projects.jade
+++ b/java/code/src/com/suse/manager/webui/controllers/contentmanagement/templates/list-projects.jade
@@ -1,7 +1,6 @@
 include /templates/common.jade
 
 +userRoles
-+userPreferences
 
 #content-management-list-projects
 
diff --git a/java/code/src/com/suse/manager/webui/templates/audit/cve.jade b/java/code/src/com/suse/manager/webui/templates/audit/cve.jade
index 408202c9a42e..de120f59892a 100644
--- a/java/code/src/com/suse/manager/webui/templates/audit/cve.jade
+++ b/java/code/src/com/suse/manager/webui/templates/audit/cve.jade
@@ -5,8 +5,6 @@ include ../common.jade
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('audit/cveaudit')
         .then(function(module) { module.renderer('cveaudit') });
diff --git a/java/code/src/com/suse/manager/webui/templates/common.jade b/java/code/src/com/suse/manager/webui/templates/common.jade
index 51ee32b02bd7..cb5c121c47bd 100644
--- a/java/code/src/com/suse/manager/webui/templates/common.jade
+++ b/java/code/src/com/suse/manager/webui/templates/common.jade
@@ -5,10 +5,6 @@ mixin csrfToken
   input(type="hidden", name="csrf_token", value="#{csrf_token}")
 
 
-mixin userPreferences
-  script(type='text/javascript').
-      window.userPrefPageSize = #{pageSize};
-
 mixin userRoles
     script(type='text/javascript').
         window.global_userRoles = !{roles};
diff --git a/java/code/src/com/suse/manager/webui/templates/content_management/list-profiles.jade b/java/code/src/com/suse/manager/webui/templates/content_management/list-profiles.jade
index 37f469371589..23b55398e230 100644
--- a/java/code/src/com/suse/manager/webui/templates/content_management/list-profiles.jade
+++ b/java/code/src/com/suse/manager/webui/templates/content_management/list-profiles.jade
@@ -6,8 +6,6 @@ script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
     window.isAdmin = #{isAdmin};
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('images/image-profiles')
         .then(function(module) { module.renderer('image-profiles') });
diff --git a/java/code/src/com/suse/manager/webui/templates/content_management/list-stores.jade b/java/code/src/com/suse/manager/webui/templates/content_management/list-stores.jade
index 5170fdcfc088..0e7b62244e4d 100644
--- a/java/code/src/com/suse/manager/webui/templates/content_management/list-stores.jade
+++ b/java/code/src/com/suse/manager/webui/templates/content_management/list-stores.jade
@@ -6,8 +6,6 @@ script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
     window.isAdmin = #{is_admin};
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('images/image-stores')
         .then(function(module) { module.renderer('image-stores') });
diff --git a/java/code/src/com/suse/manager/webui/templates/content_management/view.jade b/java/code/src/com/suse/manager/webui/templates/content_management/view.jade
index 97254a4c71b2..0f4d34c0e7a2 100644
--- a/java/code/src/com/suse/manager/webui/templates/content_management/view.jade
+++ b/java/code/src/com/suse/manager/webui/templates/content_management/view.jade
@@ -11,8 +11,6 @@ script(type='text/javascript').
     window.isRuntimeInfoEnabled = #{isRuntimeInfoEnabled};
     window.osImageStoreUrl = "#{osImageStoreUrl}";
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('images/image-view')
         .then(function(module) { module.renderer('image-view') });
diff --git a/java/code/src/com/suse/manager/webui/templates/formula_catalog/list.jade b/java/code/src/com/suse/manager/webui/templates/formula_catalog/list.jade
index 9f6db203788e..c3c65a695892 100644
--- a/java/code/src/com/suse/manager/webui/templates/formula_catalog/list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/formula_catalog/list.jade
@@ -2,8 +2,6 @@ include ../common.jade
 
 #formula-catalog
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('salt/formula-catalog/org-formula-catalog')
         .then(function(module) {
diff --git a/java/code/src/com/suse/manager/webui/templates/minion/list.jade b/java/code/src/com/suse/manager/webui/templates/minion/list.jade
index 35fe48cd6262..bfa523942a24 100644
--- a/java/code/src/com/suse/manager/webui/templates/minion/list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/minion/list.jade
@@ -5,7 +5,6 @@ include ../common.jade
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
     window.serverId = "#{serverId}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('salt/keys/key-management')
diff --git a/java/code/src/com/suse/manager/webui/templates/notification-messages/list.jade b/java/code/src/com/suse/manager/webui/templates/notification-messages/list.jade
index 9002a3aeb9e4..f5e437403d90 100644
--- a/java/code/src/com/suse/manager/webui/templates/notification-messages/list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/notification-messages/list.jade
@@ -7,8 +7,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('notifications/notification-messages')
         .then(function(module) { module.renderer('notification-messages') });
diff --git a/java/code/src/com/suse/manager/webui/templates/packages/list.jade b/java/code/src/com/suse/manager/webui/templates/packages/list.jade
index 8363120c7e24..419964e8e521 100644
--- a/java/code/src/com/suse/manager/webui/templates/packages/list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/packages/list.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('packages/list')
diff --git a/java/code/src/com/suse/manager/webui/templates/products/show.jade b/java/code/src/com/suse/manager/webui/templates/products/show.jade
index b94124a1bb6f..4308f7a32301 100644
--- a/java/code/src/com/suse/manager/webui/templates/products/show.jade
+++ b/java/code/src/com/suse/manager/webui/templates/products/show.jade
@@ -9,8 +9,6 @@ script(type='text/javascript').
     window.scc_refresh_file_locked_status = #{refreshFileLocked};
     window.noToolsChannelSubscription_flag_from_backend = #{noToolsChannelSubscription};
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('admin/setup/products/products')
         .then(function(module) { module.renderer('products') });
diff --git a/java/code/src/com/suse/manager/webui/templates/schedule/maintenance-windows.jade b/java/code/src/com/suse/manager/webui/templates/schedule/maintenance-windows.jade
index 29ae617b1fbe..472a242f5d56 100644
--- a/java/code/src/com/suse/manager/webui/templates/schedule/maintenance-windows.jade
+++ b/java/code/src/com/suse/manager/webui/templates/schedule/maintenance-windows.jade
@@ -9,8 +9,6 @@ script(type='text/javascript').
     window.type = "#{type}";
     window.isAdmin = "#{isAdmin}";
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('maintenance/maintenance-windows')
         .then(function (module) { module.renderer('maintenance-windows') });
diff --git a/java/code/src/com/suse/manager/webui/templates/schedule/recurring-actions.jade b/java/code/src/com/suse/manager/webui/templates/schedule/recurring-actions.jade
index 3f1574e5da67..a7a3710c9a8e 100644
--- a/java/code/src/com/suse/manager/webui/templates/schedule/recurring-actions.jade
+++ b/java/code/src/com/suse/manager/webui/templates/schedule/recurring-actions.jade
@@ -9,8 +9,6 @@ script(type='text/javascript').
     window.timezone = "#{h.renderTimezone()}";
     window.localTime = "#{h.renderLocalTime()}";
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('recurring/recurring-actions')
         .then(function (module) { module.renderer('recurring-actions') });
diff --git a/java/code/src/com/suse/manager/webui/templates/subscription-matching/show.jade b/java/code/src/com/suse/manager/webui/templates/subscription-matching/show.jade
index 26da6ee69305..cad06163d826 100644
--- a/java/code/src/com/suse/manager/webui/templates/subscription-matching/show.jade
+++ b/java/code/src/com/suse/manager/webui/templates/subscription-matching/show.jade
@@ -4,7 +4,6 @@ include ../common.jade
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('audit/subscription-matching')
diff --git a/java/code/src/com/suse/manager/webui/templates/systems/all-list.jade b/java/code/src/com/suse/manager/webui/templates/systems/all-list.jade
index ea925c57636a..8672e20abd33 100644
--- a/java/code/src/com/suse/manager/webui/templates/systems/all-list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/systems/all-list.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('systems/list/all')
diff --git a/java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade b/java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade
index cdf32703f247..8bb678283778 100644
--- a/java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('systems/list/virtual')
diff --git a/java/code/src/com/suse/manager/webui/templates/taskotop/show.jade b/java/code/src/com/suse/manager/webui/templates/taskotop/show.jade
index ef84aed385aa..8445275aca77 100644
--- a/java/code/src/com/suse/manager/webui/templates/taskotop/show.jade
+++ b/java/code/src/com/suse/manager/webui/templates/taskotop/show.jade
@@ -4,8 +4,6 @@ include ../common.jade
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('admin/task-engine-status/taskotop')
         .then(function(module) { module.renderer('taskotop') });
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualhostmanager/list.jade b/java/code/src/com/suse/manager/webui/templates/virtualhostmanager/list.jade
index 88cb6ab25ff7..7f224cc1451d 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualhostmanager/list.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualhostmanager/list.jade
@@ -4,8 +4,6 @@ include ../common.jade
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
 
-+userPreferences
-
 script(type='text/javascript').
     spaImportReactPage('systems/virtualhostmanager/virtualhostmanager')
         .then(function(module) { module.renderer('virtual-host-managers') });
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/guests/create.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/guests/create.jade
index 77f5bda897b3..b74bda8c015b 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/guests/create.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/guests/create.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('virtualization/guests/create/guests-create')
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/guests/edit.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/guests/edit.jade
index 057995600cfe..523e0c142b62 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/guests/edit.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/guests/edit.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('virtualization/guests/edit/guests-edit')
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/guests/show.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/guests/show.jade
index 452b7d6f6d00..54dd3af09bb8 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/guests/show.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/guests/show.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('virtualization/guests/list/guests-list')
@@ -14,7 +13,6 @@ script(type='text/javascript').
               'virtualguests',
               {
                   serverId: "#{server.id}",
-                  pageSize: "#{pageSize}",
                   saltEntitled: #{salt_entitled},
                   foreignEntitled: #{foreign_entitled},
                   isAdmin: #{is_admin},
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/nets/create.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/nets/create.jade
index 297277e9860c..b3525cadef9c 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/nets/create.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/nets/create.jade
@@ -6,7 +6,6 @@ script(src='/javascript/validator/validator.min.js?cb=#{webBuildtimestamp}', typ
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('virtualization/nets/create/nets-create')
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/nets/edit.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/nets/edit.jade
index 4f628df64ff9..20140519ba09 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/nets/edit.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/nets/edit.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('virtualization/nets/edit/nets-edit')
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/nets/show.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/nets/show.jade
index 07bb4731c98f..aed8cb37ab51 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/nets/show.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/nets/show.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('virtualization/nets/list/nets-list')
@@ -14,7 +13,6 @@ script(type='text/javascript').
               'virtualnets',
               {
                   serverId: "#{server.id}",
-                  pageSize: "#{pageSize}",
                   hypervisor: "#{hypervisor}",
                   support_enhanced_network: #{support_enhanced_network}
               }
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/pools/create.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/pools/create.jade
index 0016be880001..1b0efa56cbbd 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/pools/create.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/pools/create.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('virtualization/pools/create/pools-create')
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/pools/edit.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/pools/edit.jade
index 709993a0b501..d27bade6193a 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/pools/edit.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/pools/edit.jade
@@ -5,7 +5,6 @@ script(src='/javascript/momentjs/moment-with-langs.min.js?cb=#{webBuildtimestamp
 
 script(type='text/javascript').
     window.csrfToken = "#{csrf_token}";
-+userPreferences
 
 script(type='text/javascript').
     spaImportReactPage('virtualization/pools/edit/pools-edit')
diff --git a/java/code/src/com/suse/manager/webui/templates/virtualization/pools/show.jade b/java/code/src/com/suse/manager/webui/templates/virtualization/pools/show.jade
index 8b5959b1a201..90f3f0fbbf00 100644
--- a/java/code/src/com/suse/manager/webui/templates/virtualization/pools/show.jade
+++ b/java/code/src/com/suse/manager/webui/templates/virtualization/pools/show.jade
@@ -13,7 +13,6 @@ script(type='text/javascript').
               'virtualpools',
               {
                   serverId: "#{server.id}",
-                  pageSize: "#{pageSize}",
                   hypervisor: "#{hypervisor}"
               }
             )
diff --git a/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java b/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java
index ca70e47c817a..996466caf2d4 100644
--- a/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java
+++ b/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java
@@ -204,4 +204,16 @@ public String getUserDateFormat(PageContext pageContext) {
     public String getUserTimeFormat(PageContext pageContext) {
         return "HH:mm";
     }
+
+    /**
+     * @param pageContext the current PageContext
+     * @return the user preferred page size
+     */
+    public int getUserPageSize(PageContext pageContext) {
+        User user = getAuthenticatedUser(pageContext);
+        if (isUserAuthenticated(user)) {
+            return user.getPageSize();
+        }
+        return 15;
+    }
 }
diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
index b42322cf8576..56a3b58a74fe 100644
--- a/java/code/webapp/WEB-INF/decorators/layout_head.jsp
+++ b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -59,12 +59,14 @@
     <c:set var="userTimeZone" value="${GlobalInstanceHolder.USER_PREFERENCE_UTILS.getExtendedUserTimeZone(pageContext)}"/>
     <c:set var="userDateFormat" value="${GlobalInstanceHolder.USER_PREFERENCE_UTILS.getUserDateFormat(pageContext)}"/>
     <c:set var="userTimeFormat" value="${GlobalInstanceHolder.USER_PREFERENCE_UTILS.getUserTimeFormat(pageContext)}"/>
+    <c:set var="userPageSize" value="${GlobalInstanceHolder.USER_PREFERENCE_UTILS.getUserPageSize(pageContext)}"/>
     <script>
         window.serverTime='${serverTime}'
         window.serverTimeZone='${serverTimeZone}'
         window.userTimeZone='${userTimeZone}'
         window.userDateFormat='${userDateFormat}'
         window.userTimeFormat='${userTimeFormat}'
+        window.userPrefPageSize=${userPageSize}
     </script>
 
     <script src="/javascript/legacy/jquery.min.js?cb=${cb_version}"></script>
diff --git a/java/spacewalk-java.changes.cbosdo.page-size b/java/spacewalk-java.changes.cbosdo.page-size
new file mode 100644
index 000000000000..87f7493f3c46
--- /dev/null
+++ b/java/spacewalk-java.changes.cbosdo.page-size
@@ -0,0 +1 @@
+- Fix the use of page size preference in systems and packages lists
diff --git a/web/html/src/manager/virtualization/ListTab.tsx b/web/html/src/manager/virtualization/ListTab.tsx
index 5e4b28f6e793..e570efbc60c2 100644
--- a/web/html/src/manager/virtualization/ListTab.tsx
+++ b/web/html/src/manager/virtualization/ListTab.tsx
@@ -31,7 +31,6 @@ type CreateModalButtonType = (actionType: string, actionData: Array<ModalDataTyp
 type Props = {
   serverId: string;
   saltEntitled: boolean;
-  pageSize: number;
   type: string;
   urlType?: string;
   title: string;
@@ -230,7 +229,6 @@ export function ListTab(props: Props) {
                     emptyText={t(`No virtual ${props.type} to show.`)}
                     identifier={(row) => row[props.idName]}
                     initialSortColumnKey="name"
-                    initialItemsPerPage={props.pageSize}
                     selectable
                     selectedItems={selectedItems.map((item) => item[props.idName])}
                     onSelect={(items) => setSelectedItems(data?.filter((d) => items.includes(d[props.idName])) || [])}
diff --git a/web/html/src/manager/virtualization/guests/list/guests-list.renderer.tsx b/web/html/src/manager/virtualization/guests/list/guests-list.renderer.tsx
index 9935977c9835..e2aa91186452 100644
--- a/web/html/src/manager/virtualization/guests/list/guests-list.renderer.tsx
+++ b/web/html/src/manager/virtualization/guests/list/guests-list.renderer.tsx
@@ -7,21 +7,16 @@ import { HostInfo } from "./guests-list";
 
 type RendererProps = {
   serverId: string;
-  pageSize: number;
   saltEntitled: boolean;
   foreignEntitled: boolean;
   isAdmin: boolean;
   hostInfo?: HostInfo;
 };
 
-export const renderer = (
-  id: string,
-  { serverId, pageSize, saltEntitled, foreignEntitled, isAdmin, hostInfo }: RendererProps
-) => {
+export const renderer = (id: string, { serverId, saltEntitled, foreignEntitled, isAdmin, hostInfo }: RendererProps) => {
   SpaRenderer.renderNavigationReact(
     <GuestsList
       serverId={serverId}
-      pageSize={pageSize}
       saltEntitled={saltEntitled}
       foreignEntitled={foreignEntitled}
       isAdmin={isAdmin}
diff --git a/web/html/src/manager/virtualization/guests/list/guests-list.tsx b/web/html/src/manager/virtualization/guests/list/guests-list.tsx
index 28ab0e9ac5ff..979271e6432c 100644
--- a/web/html/src/manager/virtualization/guests/list/guests-list.tsx
+++ b/web/html/src/manager/virtualization/guests/list/guests-list.tsx
@@ -19,7 +19,6 @@ export type HostInfo = {
 
 type Props = {
   serverId: string;
-  pageSize: number;
   saltEntitled: boolean;
   foreignEntitled: boolean;
   isAdmin: boolean;
@@ -99,7 +98,6 @@ export function GuestsList(props: Props) {
       <ListTab
         serverId={props.serverId}
         saltEntitled={props.saltEntitled}
-        pageSize={props.pageSize}
         type="guest"
         title={t("Hosted Virtual Systems")}
         description={t("This is a list of virtual guests which are configured to run on this host.")}
diff --git a/web/html/src/manager/virtualization/nets/list/nets-list.renderer.tsx b/web/html/src/manager/virtualization/nets/list/nets-list.renderer.tsx
index 0c19729be8e3..5377b77f4225 100644
--- a/web/html/src/manager/virtualization/nets/list/nets-list.renderer.tsx
+++ b/web/html/src/manager/virtualization/nets/list/nets-list.renderer.tsx
@@ -6,19 +6,13 @@ import { NetsList } from "./nets-list";
 
 type RendererProps = {
   serverId: string;
-  pageSize: number;
   hypervisor: string;
   support_enhanced_network: boolean;
 };
 
-export const renderer = (id: string, { serverId, pageSize, hypervisor, support_enhanced_network }: RendererProps) => {
+export const renderer = (id: string, { serverId, hypervisor, support_enhanced_network }: RendererProps) => {
   SpaRenderer.renderNavigationReact(
-    <NetsList
-      serverId={serverId}
-      pageSize={pageSize}
-      hypervisor={hypervisor}
-      allow_changing={support_enhanced_network}
-    />,
+    <NetsList serverId={serverId} hypervisor={hypervisor} allow_changing={support_enhanced_network} />,
     document.getElementById(id)
   );
 };
diff --git a/web/html/src/manager/virtualization/nets/list/nets-list.tsx b/web/html/src/manager/virtualization/nets/list/nets-list.tsx
index c4cd7c760ead..a75f0e81f384 100644
--- a/web/html/src/manager/virtualization/nets/list/nets-list.tsx
+++ b/web/html/src/manager/virtualization/nets/list/nets-list.tsx
@@ -12,7 +12,6 @@ import { ListTab } from "../../ListTab";
 
 type Props = {
   serverId: string;
-  pageSize: number;
   hypervisor: string;
   allow_changing: boolean;
 };
@@ -46,7 +45,6 @@ export function NetsList(props: Props) {
       <HypervisorCheck hypervisor={props.hypervisor} />
       <ListTab
         serverId={props.serverId}
-        pageSize={props.pageSize}
         type="network"
         urlType="nets"
         title={t("Virtual Networks")}
diff --git a/web/html/src/manager/virtualization/pools/list/pools-list.renderer.tsx b/web/html/src/manager/virtualization/pools/list/pools-list.renderer.tsx
index 6cf134b54846..acc0725ed9c6 100644
--- a/web/html/src/manager/virtualization/pools/list/pools-list.renderer.tsx
+++ b/web/html/src/manager/virtualization/pools/list/pools-list.renderer.tsx
@@ -6,13 +6,12 @@ import { PoolsList } from "./pools-list";
 
 type RendererProps = {
   serverId: string;
-  pageSize: number;
   hypervisor: string;
 };
 
-export const renderer = (id: string, { serverId, pageSize, hypervisor }: RendererProps) => {
+export const renderer = (id: string, { serverId, hypervisor }: RendererProps) => {
   SpaRenderer.renderNavigationReact(
-    <PoolsList pageSize={pageSize} serverId={serverId} hypervisor={hypervisor} />,
+    <PoolsList serverId={serverId} hypervisor={hypervisor} />,
     document.getElementById(id)
   );
 };
diff --git a/web/html/src/manager/virtualization/pools/list/pools-list.tsx b/web/html/src/manager/virtualization/pools/list/pools-list.tsx
index 7eeb3131df97..72e6ff5ec0f0 100644
--- a/web/html/src/manager/virtualization/pools/list/pools-list.tsx
+++ b/web/html/src/manager/virtualization/pools/list/pools-list.tsx
@@ -23,7 +23,6 @@ import { VirtualizationPoolsActionApi } from "../virtualization-pools-action-api
 
 type Props = {
   serverId: string;
-  pageSize: number;
   hypervisor: string;
 };
 
@@ -377,7 +376,6 @@ export function PoolsList(props: Props) {
                   <CustomDataHandler
                     data={getPoolsAndVolumes(tree)}
                     identifier={(raw) => raw.id}
-                    initialItemsPerPage={Number(props.pageSize)}
                     loading={tree == null}
                     additionalFilters={[]}
                     searchField={
diff --git a/web/spacewalk-web.changes.cbosdo.page-size b/web/spacewalk-web.changes.cbosdo.page-size
new file mode 100644
index 000000000000..87f7493f3c46
--- /dev/null
+++ b/web/spacewalk-web.changes.cbosdo.page-size
@@ -0,0 +1 @@
+- Fix the use of page size preference in systems and packages lists