Take user prefered list size into account in systems lists pages

Fixes uyuni-project#7633
cbosdo · Oct 4, 2023 · 491d276 · 491d276
1 parent 39f76bd
commit 491d276
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 4 deletions.
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
@@ -13,6 +13,7 @@ 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
@@ -13,6 +13,7 @@ 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
@@ -0,0 +1 @@
+- 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
@@ -7,16 +7,23 @@ 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, { isAdmin, queryColumn, query }: RendererProps) =>
+export const renderer = (id: string, docsLocale: string, { pageSize, isAdmin, queryColumn, query }: RendererProps) =>
   SpaRenderer.renderNavigationReact(
     <>
       <MessagesContainer />
-      <AllSystems docsLocale={docsLocale} isAdmin={isAdmin} queryColumn={queryColumn} query={query} />
+      <AllSystems
+        docsLocale={docsLocale}
+        pageSize={pageSize}
+        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
@@ -13,6 +13,7 @@ import { SystemsListFilter } from "./list-filter";
 type Props = {
   /** Locale of the help links */
   docsLocale: string;
+  pageSize: number;
   isAdmin: boolean;
   queryColumn?: string;
   query?: string;
@@ -54,6 +55,7 @@ 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
@@ -7,14 +7,15 @@ import { MessagesContainer } from "components/toastr";
 import { VirtualSystems } from "./virtual-list";
 
 type RendererProps = {
+  pageSize: number;
   isAdmin: boolean;
 };
 
-export const renderer = (id: string, docsLocale: string, { isAdmin }: RendererProps) =>
+export const renderer = (id: string, docsLocale: string, { pageSize, isAdmin }: RendererProps) =>
   SpaRenderer.renderNavigationReact(
     <>
       <MessagesContainer />
-      <VirtualSystems docsLocale={docsLocale} isAdmin={isAdmin} />
+      <VirtualSystems docsLocale={docsLocale} pageSize={pageSize} 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
@@ -13,6 +13,7 @@ import Network from "utils/network";
 type Props = {
   /** Locale of the help links */
   docsLocale: string;
+  pageSize: number;
   isAdmin: boolean;
 };
 
@@ -53,6 +54,7 @@ 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
@@ -0,0 +1 @@
+- Take user prefered page size into account in systems lists