From 9e471f4c331815e2192b778ae1e74ab48f5e8be5 Mon Sep 17 00:00:00 2001 From: hoangnt2 Date: Thu, 30 Nov 2023 15:59:00 +0700 Subject: [PATCH] fix(Table): Fix change page size error when server pagination is not defined --- src/components/sw360/Table/Table.tsx | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/components/sw360/Table/Table.tsx b/src/components/sw360/Table/Table.tsx index 1756337ea..101c0b8a0 100644 --- a/src/components/sw360/Table/Table.tsx +++ b/src/components/sw360/Table/Table.tsx @@ -33,14 +33,15 @@ class Table extends Component { private wrapper: RefObject = 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 { } } - this.instance = new Grid(tableProps) + this.instance = new Grid(this.tableProps) } getInstance(): Grid { @@ -79,10 +80,12 @@ class Table extends Component { .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()