Merge pull request #181 from toshiba/release/fix-change-page-size

fix(Table): Fix change page size error when server pagination is not defined
eclipse-sw360 · Nov 30, 2023 · e6fa710 · e6fa710
2 parents 947545c + 9e471f4
commit e6fa710
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/components/sw360/Table/Table.tsx b/src/components/sw360/Table/Table.tsx
@@ -33,14 +33,15 @@ class Table extends Component<TableProps, unknown> {
     private wrapper: RefObject<HTMLDivElement> = createRef()
     // Grid.js instance
     private readonly instance: Grid = null
+    private tableProps: TableProps = {}
 
     constructor(props: TableProps) {
         super(props)
-        let tableProps = { ...defaultOptions, ...props }
+        this.tableProps = { ...defaultOptions, ...props }
 
-        if (tableProps.server) {
-            tableProps = {
-                ...tableProps,
+        if (this.tableProps.server) {
+            this.tableProps = {
+                ...this.tableProps,
                 pagination: {
                     limit: 10,
                     server: {
@@ -52,7 +53,7 @@ class Table extends Component<TableProps, unknown> {
             }
         }
 
-        this.instance = new Grid(tableProps)
+        this.instance = new Grid(this.tableProps)
     }
 
     getInstance(): Grid {
@@ -79,10 +80,12 @@ class Table extends Component<TableProps, unknown> {
             .updateConfig({
                 pagination: {
                     limit: pageSize,
-                    server: {
-                        url: (prev: string, page: number, limit: number) =>
-                            `${prev}${prev.includes('?') ? '&' : '?'}page=${page}&page_entries=${limit}`,
-                    },
+                    server: this.tableProps.server
+                        ? {
+                              url: (prev: string, page: number, limit: number) =>
+                                  `${prev}${prev.includes('?') ? '&' : '?'}page=${page}&page_entries=${limit}`,
+                          }
+                        : undefined,
                 },
             })
             .forceRender()