Adjust pageSize handling in Jade / JS / JSP

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
 

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
 

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') });

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};

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') });

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') });

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') });

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) {

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')

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') });

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')

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') });

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') });

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') });

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')

java/code/src/com/suse/manager/webui/templates/systems/all-list.jade

@@ -5,15 +5,13 @@ 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')
         .then(function(module) {
             module.renderer(
                 'systems-all-list', '#{docsLocale}',
                 {
-                    pageSize: #{pageSize},
                     isAdmin: #{is_admin},
                     queryColumn: #{queryColumn},
                     query: !{query}

java/code/src/com/suse/manager/webui/templates/systems/virtual-list.jade

@@ -5,15 +5,13 @@ 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')
         .then(function(module) {
             module.renderer(
                 'systems-virtual-list', '#{docsLocale}',
                 {
-                    pageSize: #{pageSize},
                     isAdmin: #{is_admin}
                 }
             )

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') });

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') });

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')

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')

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},

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')

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')

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}
               }

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')

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')

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}"
               }
             )

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;
+    }
 }

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>

java/spacewalk-java.changes.cbosdo.page-size

@@ -1 +1 @@
-- Take user prefered page size into account in systems lists
+- Fix the use of page size preference in systems and packages lists

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)
   );

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

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)
   );

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}

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])) || [])}